Skip to content

Commit

Permalink
ARM: 9095/1: ARM64: Remove arm_pm_restart()
Browse files Browse the repository at this point in the history
All users of arm_pm_restart() have been converted to use the kernel
restart handler.

Acked-by: Arnd Bergmann <[email protected]>
Reviewed-by: Wolfram Sang <[email protected]>
Tested-by: Wolfram Sang <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
Signed-off-by: Guenter Roeck <[email protected]>
Signed-off-by: Thierry Reding <[email protected]>
Signed-off-by: Lee Jones <[email protected]>
Signed-off-by: Russell King <[email protected]>
  • Loading branch information
groeck authored and Russell King (Oracle) committed Jun 13, 2021
1 parent ce8f1cc commit ab6cef1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 0 additions & 2 deletions arch/arm64/include/asm/system_misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
7 changes: 1 addition & 6 deletions arch/arm64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -201,10 +199,7 @@ 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);
do_kernel_restart(cmd);

/*
* Whoops - the architecture was unable to reboot.
Expand Down

0 comments on commit ab6cef1

Please sign in to comment.