Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b6d864b authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

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: default avatarRobin 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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 16d6d5b0

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -223,11 +223,12 @@ extern int iop3xx_get_init_atu(void); 
#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





#include <linux/types.h>

#include <linux/types.h>

#include <linux/reboot.h>





void iop3xx_map_io(void);

void iop3xx_map_io(void);

void iop_init_cp6_handler(void);

void iop_init_cp6_handler(void);

void iop_init_time(unsigned long tickrate);

void iop_init_time(unsigned long tickrate);

void iop3xx_restart(char, const char *);

void iop3xx_restart(enum reboot_mode, const char *);





static inline u32 read_tmr0(void)

static inline u32 read_tmr0(void)

{

{

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ struct machine_desc { 
#ifdef CONFIG_MULTI_IRQ_HANDLER

#ifdef CONFIG_MULTI_IRQ_HANDLER

	void			(*handle_irq)(struct pt_regs *);

	void			(*handle_irq)(struct pt_regs *);

#endif

#endif

	void			(*restart)(char, const char *);

	void			(*restart)(enum reboot_mode, const char *);

};

};





/*

/*

arch/arm/include/asm/system_misc.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,11 +6,12 @@ 
#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/linkage.h>

#include <linux/linkage.h>

#include <linux/irqflags.h>

#include <linux/irqflags.h>

#include <linux/reboot.h>





extern void cpu_init(void);

extern void cpu_init(void);





void soft_restart(unsigned long);

void soft_restart(unsigned long);

extern void (*arm_pm_restart)(char str, const char *cmd);

extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);

extern void (*arm_pm_idle)(void);

extern void (*arm_pm_idle)(void);





#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_UNDEFINED	(1 << 0)

arch/arm/kernel/process.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/hw_breakpoint.h>

#include <linux/hw_breakpoint.h>

#include <linux/cpuidle.h>

#include <linux/cpuidle.h>

#include <linux/leds.h>

#include <linux/leds.h>

#include <linux/reboot.h>





#include <asm/cacheflush.h>

#include <asm/cacheflush.h>

#include <asm/idmap.h>

#include <asm/idmap.h>
@@ -113,7 +114,7 @@ void soft_restart(unsigned long addr) 
	BUG();

	BUG();

}

}





static void null_restart(char mode, const char *cmd)

static void null_restart(enum reboot_mode reboot_mode, const char *cmd)

{

{

}

}
@@ -123,7 +124,7 @@ static void null_restart(char mode, const char *cmd) 
void (*pm_power_off)(void);

void (*pm_power_off)(void);

EXPORT_SYMBOL(pm_power_off);

EXPORT_SYMBOL(pm_power_off);





void (*arm_pm_restart)(char str, const char *cmd) = null_restart;

void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd) = null_restart;

EXPORT_SYMBOL_GPL(arm_pm_restart);

EXPORT_SYMBOL_GPL(arm_pm_restart);





/*

/*

arch/arm/mach-at91/at91rm9200.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
 */

 */





#include <linux/module.h>

#include <linux/module.h>

#include <linux/reboot.h>





#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -304,7 +305,7 @@ static void at91rm9200_idle(void) 
	at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);

	at91_pmc_write(AT91_PMC_SCDR, AT91_PMC_PCK);

}

}





static void at91rm9200_restart(char mode, const char *cmd)

static void at91rm9200_restart(enum reboot_mode reboot_mode, const char *cmd)

{

{

	/*

	/*

	 * Perform a hardware reset with the use of the Watchdog timer.

	 * Perform a hardware reset with the use of the Watchdog timer.