diff options
author | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-04 13:19:05 -0700 |
commit | 6a33fc8cacfc7fac829c72bd321868be7e72f609 (patch) | |
tree | ca8572f214a30c4743b731b4ab2809a980b78369 /arch/arm/mach-sti/platsmp.c | |
parent | 3bd957978bb50390bb07678bc4c125989e9a81a2 (diff) | |
parent | 2746a7c272a3242f919fa2fd5a5f2d9f8a41173a (diff) | |
download | blackbird-obmc-linux-6a33fc8cacfc7fac829c72bd321868be7e72f609.tar.gz blackbird-obmc-linux-6a33fc8cacfc7fac829c72bd321868be7e72f609.zip |
Merge tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical
From Jason Cooper:
mvebu fixes-non-critical for v3.12
- dove
- fix section mismatch (all callers are already _init, so it's just a space
issue)
* tag 'fixes-non-3.12' of git://git.infradead.org/linux-mvebu:
ARM: dove: fix missing __init section of dove_mpp_gpio_mode
+ Linux 3.11-rc2
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-sti/platsmp.c')
-rw-r--r-- | arch/arm/mach-sti/platsmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c index 977a863468fc..dce50d983a8e 100644 --- a/arch/arm/mach-sti/platsmp.c +++ b/arch/arm/mach-sti/platsmp.c @@ -27,7 +27,7 @@ #include "smp.h" -static void __cpuinit write_pen_release(int val) +static void write_pen_release(int val) { pen_release = val; smp_wmb(); @@ -37,7 +37,7 @@ static void __cpuinit write_pen_release(int val) static DEFINE_SPINLOCK(boot_lock); -void __cpuinit sti_secondary_init(unsigned int cpu) +void sti_secondary_init(unsigned int cpu) { trace_hardirqs_off(); @@ -54,7 +54,7 @@ void __cpuinit sti_secondary_init(unsigned int cpu) spin_unlock(&boot_lock); } -int __cpuinit sti_boot_secondary(unsigned int cpu, struct task_struct *idle) +int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) { unsigned long timeout; |