diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-20 20:03:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-20 20:03:18 +0800 |
| commit | 1d9da9a7ce81869d023c5e37b0e12ea22717ec95 (patch) | |
| tree | 70b4cc1f7003724e722f9fcbd0956e7920c2e854 /arch/arm/mach-qcom/platsmp.c | |
| parent | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff) | |
| parent | 962a3b553850698c5aad17d382ece72c2f8abdf2 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlinux-linaro-lsk-v4.1-android-test
Diffstat (limited to 'arch/arm/mach-qcom/platsmp.c')
| -rw-r--r-- | arch/arm/mach-qcom/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c index 5cde63a64b34..9b00123a315d 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -49,7 +49,7 @@ extern void secondary_startup_arm(void); static DEFINE_SPINLOCK(boot_lock); #ifdef CONFIG_HOTPLUG_CPU -static void __ref qcom_cpu_die(unsigned int cpu) +static void qcom_cpu_die(unsigned int cpu) { wfi(); } |