Skip to content

Commit 7b6d864

Browse files
Robin Holttorvalds
Robin Holt
authored andcommittedJul 9, 2013
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. [[email protected]: fix arch/arm/mach-socfpga/socfpga.c] Signed-off-by: Robin Holt <[email protected]> Cc: Russell King <[email protected]> Cc: Russ Anderson <[email protected]> Cc: Robin Holt <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Guan Xuetao <[email protected]> Acked-by: Russell King <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 16d6d5b commit 7b6d864

File tree

125 files changed

+282
-166
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+282
-166
lines changed
 

‎arch/arm/include/asm/hardware/iop3xx.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,12 @@ extern int iop3xx_get_init_atu(void);
223223
#ifndef __ASSEMBLY__
224224

225225
#include <linux/types.h>
226+
#include <linux/reboot.h>
226227

227228
void iop3xx_map_io(void);
228229
void iop_init_cp6_handler(void);
229230
void iop_init_time(unsigned long tickrate);
230-
void iop3xx_restart(char, const char *);
231+
void iop3xx_restart(enum reboot_mode, const char *);
231232

232233
static inline u32 read_tmr0(void)
233234
{

‎arch/arm/include/asm/mach/arch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct machine_desc {
5959
#ifdef CONFIG_MULTI_IRQ_HANDLER
6060
void (*handle_irq)(struct pt_regs *);
6161
#endif
62-
void (*restart)(char, const char *);
62+
void (*restart)(enum reboot_mode, const char *);
6363
};
6464

6565
/*

0 commit comments

Comments
 (0)
Please sign in to comment.