aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-06-12 16:35:33 +0800
committerAlex Shi <alex.shi@linaro.org>2015-06-12 17:48:16 +0800
commitde7c08b00f1ad03dafe48e74304366afbecffaf7 (patch)
treea32bc8aafb812ba1ed09d9d1b81ad612166fb499
parenta3b65c0477066d6318747cf766182322e8cea020 (diff)
Revert "arm64: Fix definition of arm_pm_restart to match the declaration"stable/sched-upstreameas-test
This reverts commit 52cefcbab44f99c844eb7a0e8e967b63d871a007. Above 5 arm64 commits ask for more aarch64 support, so they are not suitable for EAS. Signed-off-by: Alex Shi <alex.shi@linaro.org>
-rw-r--r--arch/arm64/kernel/process.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index be6f527ba12..0860fc3077f 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -81,7 +81,7 @@ void soft_restart(unsigned long addr)
void (*pm_power_off)(void);
EXPORT_SYMBOL_GPL(pm_power_off);
-void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd);
+void (*arm_pm_restart)(char str, const char *cmd);
EXPORT_SYMBOL_GPL(arm_pm_restart);
void arch_cpu_idle_prepare(void)