Commit ab6cef1d authored by Guenter Roeck's avatar Guenter Roeck Committed by Russell King (Oracle)
Browse files

ARM: 9095/1: ARM64: Remove arm_pm_restart() 



All users of arm_pm_restart() have been converted to use the kernel
restart handler.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent ce8f1ccb

arch/arm64/include/asm/system_misc.h

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int, 
struct mm_struct;

extern void __show_regs(struct pt_regs *);



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



#endif	/* __ASSEMBLY__ */



#endif	/* __ASM_SYSTEM_MISC_H */

arch/arm64/kernel/process.c

+1 −6
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ EXPORT_SYMBOL(__stack_chk_guard); 
void (*pm_power_off)(void);

EXPORT_SYMBOL_GPL(pm_power_off);



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



static void noinstr __cpu_do_idle(void)

{

	dsb(sy);
@@ -201,9 +199,6 @@ void machine_restart(char *cmd) 
		efi_reboot(reboot_mode, NULL);



	/* Now call the architecture specific reboot code. */

	if (arm_pm_restart)

		arm_pm_restart(reboot_mode, cmd);

	else

	do_kernel_restart(cmd);



	/*