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

Commit ff701306 authored by Marc Zyngier's avatar Marc Zyngier Committed by Catalin Marinas
Browse files

arm64: use common reboot infrastructure 



Commit 7b6d864b (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: default avatarMarc Zyngier <marc.zyngier@arm.com>
[catalin.marinas@arm.com: removed reboot_mode = REBOOT_HARD default setting]
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent db6f4106

arch/arm64/include/asm/system_misc.h

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

#include <linux/linkage.h>

#include <linux/irqflags.h>

#include <linux/reboot.h>



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



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);



#define UDBG_UNDEFINED	(1 << 0)

#define UDBG_SYSCALL	(1 << 1)

arch/arm64/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void machine_restart(char *cmd) 


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

	if (arm_pm_restart)

		arm_pm_restart('h', cmd);

		arm_pm_restart(reboot_mode, cmd);



	/*

	 * Whoops - the architecture was unable to reboot.