Skip to content

Commit ff70130

Browse files
Marc Zyngierctmarinas
authored andcommitted
arm64: use common reboot infrastructure
Commit 7b6d864 (reboot: arm: change reboot_mode to use enum reboot_mode) changed the way reboot is handled on arm, which has a direct impact on arm64 as we share the reset driver on the VE platform. The obvious fix is to move arm64 to use the same infrastructure. Signed-off-by: Marc Zyngier <[email protected]> [[email protected]: removed reboot_mode = REBOOT_HARD default setting] Signed-off-by: Catalin Marinas <[email protected]>
1 parent db6f410 commit ff70130

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

arch/arm64/include/asm/system_misc.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/compiler.h>
2424
#include <linux/linkage.h>
2525
#include <linux/irqflags.h>
26+
#include <linux/reboot.h>
2627

2728
struct pt_regs;
2829

@@ -41,7 +42,7 @@ extern void show_pte(struct mm_struct *mm, unsigned long addr);
4142
extern void __show_regs(struct pt_regs *);
4243

4344
void soft_restart(unsigned long);
44-
extern void (*arm_pm_restart)(char str, const char *cmd);
45+
extern void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
4546

4647
#define UDBG_UNDEFINED (1 << 0)
4748
#define UDBG_SYSCALL (1 << 1)

arch/arm64/kernel/process.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void machine_restart(char *cmd)
132132

133133
/* Now call the architecture specific reboot code. */
134134
if (arm_pm_restart)
135-
arm_pm_restart('h', cmd);
135+
arm_pm_restart(reboot_mode, cmd);
136136

137137
/*
138138
* Whoops - the architecture was unable to reboot.

0 commit comments

Comments
 (0)