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>
This commit is contained in:

committed by
Linus Torvalds

orang tua
16d6d5b00e
melakukan
7b6d864b48
@@ -198,9 +198,9 @@ void __init footbridge_map_io(void)
|
||||
}
|
||||
}
|
||||
|
||||
void footbridge_restart(char mode, const char *cmd)
|
||||
void footbridge_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
if (mode == 's') {
|
||||
if (mode == REBOOT_SOFT) {
|
||||
/* Jump into the ROM */
|
||||
soft_restart(0x41000000);
|
||||
} else {
|
||||
|
@@ -1,3 +1,4 @@
|
||||
#include <linux/reboot.h>
|
||||
|
||||
extern void footbridge_timer_init(void);
|
||||
extern void isa_timer_init(void);
|
||||
@@ -8,4 +9,4 @@ extern void footbridge_map_io(void);
|
||||
extern void footbridge_init_irq(void);
|
||||
|
||||
extern void isa_init_irq(unsigned int irq);
|
||||
extern void footbridge_restart(char, const char *);
|
||||
extern void footbridge_restart(enum reboot_mode, const char *);
|
||||
|
@@ -634,9 +634,9 @@ fixup_netwinder(struct tag *tags, char **cmdline, struct meminfo *mi)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void netwinder_restart(char mode, const char *cmd)
|
||||
static void netwinder_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
if (mode == 's') {
|
||||
if (mode == REBOOT_SOFT) {
|
||||
/* Jump into the ROM */
|
||||
soft_restart(0x41000000);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user