aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-vexpress/hotplug.c
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-01-22 17:09:59 +0800
committerAlex Shi <alex.shi@linaro.org>2016-01-22 17:09:59 +0800
commit7b8892bba12eba95f3e1615dfeb8ad77e3b0371a (patch)
tree70b4cc1f7003724e722f9fcbd0956e7920c2e854 /arch/arm/mach-vexpress/hotplug.c
parentfef6c6c09f13ef1f58fd841a08da53c6a8651bdf (diff)
parentefab1adba28d9ebbfa86808375fc085c4e84e746 (diff)
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-androidlsk-v4.1-16.01-android
Diffstat (limited to 'arch/arm/mach-vexpress/hotplug.c')
-rw-r--r--arch/arm/mach-vexpress/hotplug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index f0ce6b8f5e71..f2fafc10a91d 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -85,7 +85,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
*
* Called with IRQs disabled
*/
-void __ref vexpress_cpu_die(unsigned int cpu)
+void vexpress_cpu_die(unsigned int cpu)
{
int spurious = 0;