diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2013-02-28 13:14:37 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2013-05-08 05:23:00 -0400 |
| commit | aa1e8ec1d2a997b39aebab13c32b77da2ac0f287 (patch) | |
| tree | 718754e6b7332089d05aaf03d0b0f59034b81ca5 /arch/arm64/kernel | |
| parent | c4188edc9e92fdc4b341c5cba91ffd8c3e9997e5 (diff) | |
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) | |||
| 81 | void (*pm_power_off)(void); | 81 | void (*pm_power_off)(void); |
| 82 | EXPORT_SYMBOL_GPL(pm_power_off); | 82 | EXPORT_SYMBOL_GPL(pm_power_off); |
| 83 | 83 | ||
| 84 | void (*pm_restart)(const char *cmd); | 84 | void (*arm_pm_restart)(char str, const char *cmd); |
| 85 | EXPORT_SYMBOL_GPL(pm_restart); | 85 | EXPORT_SYMBOL_GPL(arm_pm_restart); |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | /* | 88 | /* |
| @@ -164,8 +164,8 @@ void machine_restart(char *cmd) | |||
| 164 | local_fiq_disable(); | 164 | local_fiq_disable(); |
| 165 | 165 | ||
| 166 | /* Now call the architecture specific reboot code. */ | 166 | /* Now call the architecture specific reboot code. */ |
| 167 | if (pm_restart) | 167 | if (arm_pm_restart) |
| 168 | pm_restart(cmd); | 168 | arm_pm_restart('h', cmd); |
| 169 | 169 | ||
| 170 | /* | 170 | /* |
| 171 | * Whoops - the architecture was unable to reboot. | 171 | * Whoops - the architecture was unable to reboot. |
