diff options
author | Marc Zyngier <marc.zyngier@arm.com> | 2013-07-11 13:13:00 +0200 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-07-19 16:57:08 +0200 |
commit | ff701306cd49aaff80fb852323b387812bc76491 (patch) | |
tree | f1a0a512999eca18132e785bf4d05d555fd28417 /arch/arm64/kernel | |
parent | arm64: mm: don't treat user cache maintenance faults as writes (diff) | |
download | linux-ff701306cd49aaff80fb852323b387812bc76491.tar.xz linux-ff701306cd49aaff80fb852323b387812bc76491.zip |
arm64: use common reboot infrastructure
Commit 7b6d864b48d9 (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 <marc.zyngier@arm.com>
[catalin.marinas@arm.com: removed reboot_mode = REBOOT_HARD default setting]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to '')
-rw-r--r-- | arch/arm64/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 46f02c3b5015..1788bf6b471f 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -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. |