Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d6d5b0 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

reboot: arm: prepare reboot_mode for moving to generic kernel code 



Prepare for the moving the parsing of reboot= to the generic kernel code
by making reboot_mode into a more generic form.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 58591942

arch/arm/include/asm/mach/arch.h

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/types.h>



#ifndef __ASSEMBLY__

#include <linux/reboot.h>



struct tag;

struct meminfo;
@@ -43,7 +44,7 @@ struct machine_desc { 
	unsigned char		reserve_lp0 :1;	/* never has lp0	*/

	unsigned char		reserve_lp1 :1;	/* never has lp1	*/

	unsigned char		reserve_lp2 :1;	/* never has lp2	*/

	char			restart_mode;	/* default restart mode	*/

	enum reboot_mode	reboot_mode;	/* default restart mode	*/

	struct smp_operations	*smp;		/* SMP operations	*/

	bool			(*smp_init)(void);

	void			(*fixup)(struct tag *, char **,

arch/arm/kernel/process.c

+4 −4
Original line number Diff line number Diff line
@@ -175,14 +175,14 @@ void arch_cpu_idle(void) 
		default_idle();

}



static char reboot_mode = 'h';

enum reboot_mode reboot_mode = REBOOT_HARD;



int __init reboot_setup(char *str)

static int __init reboot_setup(char *str)

{

	reboot_mode = str[0];

	if ('s' == str[0])

		reboot_mode = REBOOT_SOFT;

	return 1;

}



__setup("reboot=", reboot_setup);



/*

arch/arm/kernel/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ __setup("fpe=", fpe_setup); 


extern void paging_init(struct machine_desc *desc);

extern void sanity_check_meminfo(void);

extern void reboot_setup(char *str);

extern enum reboot_mode reboot_mode;

extern void setup_dma_zone(struct machine_desc *desc);



unsigned int processor_id;
@@ -861,8 +861,8 @@ void __init setup_arch(char **cmdline_p) 


	setup_dma_zone(mdesc);



	if (mdesc->restart_mode)

		reboot_setup(&mdesc->restart_mode);

	if (mdesc->reboot_mode != REBOOT_HARD)

		reboot_mode = mdesc->reboot_mode;



	init_mm.start_code = (unsigned long) _text;

	init_mm.end_code   = (unsigned long) _etext;

arch/arm/mach-footbridge/cats-hw.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi) 
MACHINE_START(CATS, "Chalice-CATS")

	/* Maintainer: Philip Blundell */

	.atag_offset	= 0x100,

	.restart_mode	= 's',

	.reboot_mode	= REBOOT_SOFT,

	.fixup		= fixup_cats,

	.map_io		= footbridge_map_io,

	.init_irq	= footbridge_init_irq,