[PATCH -v7 09/11] arm, prepare reboot_mode for moving to generic kernel code.
From: Robin Holt <hidden>
Date: 2013-05-01 17:08:52
Also in:
lkml
Subsystem:
arm port, arm/footbridge architecture, the rest · Maintainers:
Russell King, Linus Torvalds
This patch prepares for the moving the parsing of reboot= to the generic kernel code by making reboot_mode into a more generic form. Signed-off-by: Robin Holt <redacted> To: Andrew Morton <akpm@linux-foundation.org> To: Russell King <redacted> Cc: Russ Anderson <redacted> Cc: Robin Holt <redacted> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Guan Xuetao <redacted> Cc: Linux Kernel Mailing List <redacted> Cc: the arch/x86 maintainers <x86@kernel.org> Cc: Arm Mailing List <redacted> --- arch/arm/include/asm/mach/arch.h | 3 ++- arch/arm/kernel/process.c | 8 ++++---- arch/arm/kernel/setup.c | 6 +++--- arch/arm/mach-footbridge/cats-hw.c | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h@@ -9,6 +9,7 @@ */ #ifndef __ASSEMBLY__ +#include <linux/reboot.h> struct tag; struct meminfo;
@@ -39,7 +40,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 */ void (*fixup)(struct tag *, char **, struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index ae58d3b..8b4609e 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c@@ -174,14 +174,14 @@ void arch_cpu_idle(void) default_idle(); } -static char reboot_mode = 'h'; +enum reboot_mode reboot_mode; -int __init reboot_setup(char *str) +static int __init reboot_setup(char *str) { - reboot_mode = str[0]; + if ('s' == str[0]) + reboot_mode = REBOOT_WARM; return 1; } - __setup("reboot=", reboot_setup); void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 234e339..624c226 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c@@ -72,7 +72,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;
@@ -758,8 +758,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_COLD) + reboot_mode = mdesc->reboot_mode; init_mm.start_code = (unsigned long) _text; init_mm.end_code = (unsigned long) _etext;
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..14c9cb9 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c@@ -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_WARM, .fixup = fixup_cats, .map_io = footbridge_map_io, .init_irq = footbridge_init_irq,
--
1.8.2.1