diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2014-09-26 00:03:16 +0000 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-09-26 00:00:16 -0700 |
| commit | 1c7ffc32eaadfae3e7ab106359af0cf21b7e94c1 (patch) | |
| tree | a09913bca3d4d1174c8cfd8607e93122d50f5f27 /arch/arm64/kernel | |
| parent | power/restart: call machine_restart instead of arm_pm_restart (diff) | |
| download | linux-dev-1c7ffc32eaadfae3e7ab106359af0cf21b7e94c1.tar.xz linux-dev-1c7ffc32eaadfae3e7ab106359af0cf21b7e94c1.zip | |
arm64: support restart through restart handler call chain
The kernel core now supports a restart handler call chain to restart the
system. Call it if arm_pm_restart is not set.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/process.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 1309d64aa926..0d3fb9fd0dca 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -180,6 +180,8 @@ void machine_restart(char *cmd) /* Now call the architecture specific reboot code. */ if (arm_pm_restart) arm_pm_restart(reboot_mode, cmd); + else + do_kernel_restart(cmd); /* * Whoops - the architecture was unable to reboot. |