diff options
author | Robin Holt <holt@sgi.com> | 2013-07-08 19:01:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 13:33:29 -0400 |
commit | 7b6d864b48d95e6ea1df7df64475b9cb9616dcf9 (patch) | |
tree | bc5b3c1c6021e19e51f7f5afe5fb0fbbaef9f7a3 /arch/arm/mach-highbank | |
parent | 16d6d5b00ee75307bab7e4ede9452c97b28f30e2 (diff) |
reboot: arm: change reboot_mode to use enum reboot_mode
Preparing to move the parsing of reboot= to generic kernel code forces
the change in reboot_mode handling to use the enum.
[akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c]
Signed-off-by: Robin 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: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-highbank')
-rw-r--r-- | arch/arm/mach-highbank/core.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-highbank/system.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h index 3f65206a9b92..aea1ec5ab6f8 100644 --- a/arch/arm/mach-highbank/core.h +++ b/arch/arm/mach-highbank/core.h | |||
@@ -1,8 +1,10 @@ | |||
1 | #ifndef __HIGHBANK_CORE_H | 1 | #ifndef __HIGHBANK_CORE_H |
2 | #define __HIGHBANK_CORE_H | 2 | #define __HIGHBANK_CORE_H |
3 | 3 | ||
4 | #include <linux/reboot.h> | ||
5 | |||
4 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); | 6 | extern void highbank_set_cpu_jump(int cpu, void *jump_addr); |
5 | extern void highbank_restart(char, const char *); | 7 | extern void highbank_restart(enum reboot_mode, const char *); |
6 | extern void __iomem *scu_base_addr; | 8 | extern void __iomem *scu_base_addr; |
7 | 9 | ||
8 | #ifdef CONFIG_PM_SLEEP | 10 | #ifdef CONFIG_PM_SLEEP |
diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c index 37d8384dcf19..2df5870b7583 100644 --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c | |||
@@ -15,13 +15,14 @@ | |||
15 | */ | 15 | */ |
16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
17 | #include <asm/proc-fns.h> | 17 | #include <asm/proc-fns.h> |
18 | #include <linux/reboot.h> | ||
18 | 19 | ||
19 | #include "core.h" | 20 | #include "core.h" |
20 | #include "sysregs.h" | 21 | #include "sysregs.h" |
21 | 22 | ||
22 | void highbank_restart(char mode, const char *cmd) | 23 | void highbank_restart(enum reboot_mode mode, const char *cmd) |
23 | { | 24 | { |
24 | if (mode == 'h') | 25 | if (mode == REBOOT_HARD) |
25 | highbank_set_pwr_hard_reset(); | 26 | highbank_set_pwr_hard_reset(); |
26 | else | 27 | else |
27 | highbank_set_pwr_soft_reset(); | 28 | highbank_set_pwr_soft_reset(); |