reboot: unicore32: 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: Robin Holt <holt@sgi.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
index c9447691bdac9a72563803a6f0816e415c14e4d6..93dd035a8c33f3562c5f0702d6197dfc7b58ff95 100644 (file)
--- a/arch/unicore32/kernel/process.c
+++ b/arch/unicore32/kernel/process.c
@@ -51,14 +51,14 @@ void arch_cpu_idle(void)
        local_irq_enable();
 }
 
-static char reboot_mode = 'h';
+static enum reboot_mode reboot_mode = REBOOT_HARD;
 
 int __init reboot_setup(char *str)
 {
-       reboot_mode = str[0];
+       if ('s' == str[0])
+               reboot_mode = REBOOT_SOFT;
        return 1;
 }
-
 __setup("reboot=", reboot_setup);
 
 void machine_halt(void)
@@ -88,7 +88,7 @@ void machine_restart(char *cmd)
         * we may need it to insert some 1:1 mappings so that
         * soft boot works.
         */
-       setup_mm_for_reboot(reboot_mode);
+       setup_mm_for_reboot();
 
        /* Clean and invalidate caches */
        flush_cache_all();
@@ -102,7 +102,7 @@ void machine_restart(char *cmd)
        /*
         * Now handle reboot code.
         */
-       if (reboot_mode == 's') {
+       if (reboot_mode == REBOOT_SOFT) {
                /* Jump into ROM at address 0xffff0000 */
                cpu_reset(VECTORS_BASE);
        } else {

diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h
index 30f749da8f7317ecf0613089ad0876f02ed533c7..f5c51b85ad24e59d84fab8bd461b921ba3ff555c 100644 (file)
--- a/arch/unicore32/kernel/setup.h
+++ b/arch/unicore32/kernel/setup.h
@@ -22,7 +22,7 @@ extern void puv3_ps2_init(void);
 extern void pci_puv3_preinit(void);
 extern void __init puv3_init_gpio(void);
 
-extern void setup_mm_for_reboot(char mode);
+extern void setup_mm_for_reboot(void);
 
 extern char __stubs_start[], __stubs_end[];
 extern char __vectors_start[], __vectors_end[];

diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c
index 43c20b40e4444a0af02f11f226e6f2c6a581db5c..4f5a532bee13123b08cbc775116fe4b92291973c 100644 (file)
--- a/arch/unicore32/mm/mmu.c
+++ b/arch/unicore32/mm/mmu.c
@@ -445,7 +445,7 @@ void __init paging_init(void)
  * the user-mode pages.  This will then ensure that we have predictable
  * results when turning the mmu off
  */
-void setup_mm_for_reboot(char mode)
+void setup_mm_for_reboot(void)
 {
        unsigned long base_pmdval;
        pgd_t *pgd;

diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 37d56c356a06e17b08b19cb519b8480f0932eaf2..ca29a6ffc08efda5273928c8152b35b2c468c76a 100644 (file)
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -13,6 +13,8 @@
 enum reboot_mode {
        REBOOT_COLD = 0,
        REBOOT_WARM,
+       REBOOT_HARD,
+       REBOOT_SOFT,
 };
 
 extern int register_reboot_notifier(struct notifier_block *);