diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-10-01 11:19:10 -0700 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-10-01 11:19:10 -0700 |
| commit | a7979009500df9766ba7d78554a6da9dea18dc26 (patch) | |
| tree | 81bc6683d6a4c35761a64fb1c2eeaf59af1aff9f /arch/arm | |
| parent | e156ee56cbe26c9e8df6619dac1a993245afc1d5 (diff) | |
| parent | e317c19470f6d690122519bf9ed1c9f21ea11906 (diff) | |
| download | linux-stable-a7979009500df9766ba7d78554a6da9dea18dc26.tar.gz linux-stable-a7979009500df9766ba7d78554a6da9dea18dc26.tar.bz2 linux-stable-a7979009500df9766ba7d78554a6da9dea18dc26.zip | |
Merge tag 'v3.18-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Allow parent rate changes for i2s on rk3288
and rockchip as well as s3c24xx restart handlers.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/process.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 81ef686a91ca..250b6f652afc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -114,18 +114,13 @@ void soft_restart(unsigned long addr) BUG(); } -static void null_restart(enum reboot_mode reboot_mode, const char *cmd) -{ -} - /* * Function pointers to optional machine specific functions */ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); -void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd) = null_restart; -EXPORT_SYMBOL_GPL(arm_pm_restart); +void (*arm_pm_restart)(enum reboot_mode reboot_mode, const char *cmd); /* * This is our default idle handler. @@ -230,7 +225,10 @@ void machine_restart(char *cmd) local_irq_disable(); smp_send_stop(); - arm_pm_restart(reboot_mode, cmd); + if (arm_pm_restart) + arm_pm_restart(reboot_mode, cmd); + else + do_kernel_restart(cmd); /* Give a grace period for failure to restart of 1s */ mdelay(1000); |