diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-02-28 18:14:37 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 10:23:00 +0100 |
| commit | aa1e8ec1d2a997b39aebab13c32b77da2ac0f287 (patch) | |
| tree | 718754e6b7332089d05aaf03d0b0f59034b81ca5 /arch/arm64/kernel | |
| parent | c4188edc9e92fdc4b341c5cba91ffd8c3e9997e5 (diff) | |
| download | talos-obmc-linux-aa1e8ec1d2a997b39aebab13c32b77da2ac0f287.tar.gz talos-obmc-linux-aa1e8ec1d2a997b39aebab13c32b77da2ac0f287.zip | |
arm64: vexpress: Add support for poweroff/restart
This patch adds the arm_pm_poweroff definition expected by the
vexpress-poweroff.c driver and enables the latter for arm64.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/process.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 116a60abe86f..bbefb6fdfee2 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -81,8 +81,8 @@ void soft_restart(unsigned long addr) void (*pm_power_off)(void); EXPORT_SYMBOL_GPL(pm_power_off); -void (*pm_restart)(const char *cmd); -EXPORT_SYMBOL_GPL(pm_restart); +void (*arm_pm_restart)(char str, const char *cmd); +EXPORT_SYMBOL_GPL(arm_pm_restart); /* @@ -164,8 +164,8 @@ void machine_restart(char *cmd) local_fiq_disable(); /* Now call the architecture specific reboot code. */ - if (pm_restart) - pm_restart(cmd); + if (arm_pm_restart) + arm_pm_restart('h', cmd); /* * Whoops - the architecture was unable to reboot. |
