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-realview/realview_pba8.c | |
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-realview/realview_pba8.c')
-rw-r--r-- | arch/arm/mach-realview/realview_pba8.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c index dde652a59620..10a3e1d76891 100644 --- a/arch/arm/mach-realview/realview_pba8.c +++ b/arch/arm/mach-realview/realview_pba8.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <linux/irqchip/arm-gic.h> | 30 | #include <linux/irqchip/arm-gic.h> |
31 | #include <linux/platform_data/clk-realview.h> | 31 | #include <linux/platform_data/clk-realview.h> |
32 | #include <linux/reboot.h> | ||
32 | 33 | ||
33 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
34 | #include <asm/mach-types.h> | 35 | #include <asm/mach-types.h> |
@@ -264,7 +265,7 @@ static void __init realview_pba8_timer_init(void) | |||
264 | realview_timer_init(IRQ_PBA8_TIMER0_1); | 265 | realview_timer_init(IRQ_PBA8_TIMER0_1); |
265 | } | 266 | } |
266 | 267 | ||
267 | static void realview_pba8_restart(char mode, const char *cmd) | 268 | static void realview_pba8_restart(enum reboot_mode mode, const char *cmd) |
268 | { | 269 | { |
269 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); | 270 | void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL); |
270 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); | 271 | void __iomem *lock_ctrl = __io_address(REALVIEW_SYS_LOCK); |