Skip to content

Commit ab6cef1

Browse files
groeckRussell King (Oracle)
authored andcommitted
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: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
1 parent ce8f1cc commit ab6cef1

2 files changed

Lines changed: 1 addition & 8 deletions

File tree

arch/arm64/include/asm/system_misc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ void hook_debug_fault_code(int nr, int (*fn)(unsigned long, unsigned int,
3232
struct mm_struct;
3333
extern void __show_regs(struct pt_regs *);
3434

35-
extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
36-
3735
#endif /* __ASSEMBLY__ */
3836

3937
#endif /* __ASM_SYSTEM_MISC_H */

arch/arm64/kernel/process.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ EXPORT_SYMBOL(__stack_chk_guard);
7272
void (*pm_power_off)(void);
7373
EXPORT_SYMBOL_GPL(pm_power_off);
7474

75-
void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
76-
7775
static void noinstr __cpu_do_idle(void)
7876
{
7977
dsb(sy);
@@ -201,10 +199,7 @@ void machine_restart(char *cmd)
201199
efi_reboot(reboot_mode, NULL);
202200

203201
/* Now call the architecture specific reboot code. */
204-
if (arm_pm_restart)
205-
arm_pm_restart(reboot_mode, cmd);
206-
else
207-
do_kernel_restart(cmd);
202+
do_kernel_restart(cmd);
208203

209204
/*
210205
* Whoops - the architecture was unable to reboot.

0 commit comments

Comments
 (0)