diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-01-22 17:08:54 +0800 |
commit | efab1adba28d9ebbfa86808375fc085c4e84e746 (patch) | |
tree | c82080ef077c5ea9e50a8308404c599710d6301f /arch/arm/mach-vexpress/hotplug.c | |
parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
parent | eb7d99ea962fa62f487246462a2777ac918c8895 (diff) |
Merge remote-tracking branch 'v4.1/topic/PSCI' into linux-linaro-lsk-v4.1lsk-v4.1-16.01
Diffstat (limited to 'arch/arm/mach-vexpress/hotplug.c')
-rw-r--r-- | arch/arm/mach-vexpress/hotplug.c | 2 |
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; |