projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-sti
/
platsmp.c
diff --git
a/arch/arm/mach-sti/platsmp.c
b/arch/arm/mach-sti/platsmp.c
index 977a863468fcb715079540328da5d9d3041ef48b..dce50d983a8edc267c4157903952f07487a177c7 100644
(file)
--- a/
arch/arm/mach-sti/platsmp.c
+++ b/
arch/arm/mach-sti/platsmp.c
@@
-27,7
+27,7
@@
#include "smp.h"
#include "smp.h"
-static void
__cpuinit
write_pen_release(int val)
+static void write_pen_release(int val)
{
pen_release = val;
smp_wmb();
{
pen_release = val;
smp_wmb();
@@
-37,7
+37,7
@@
static void __cpuinit write_pen_release(int val)
static DEFINE_SPINLOCK(boot_lock);
static DEFINE_SPINLOCK(boot_lock);
-void
__cpuinit
sti_secondary_init(unsigned int cpu)
+void sti_secondary_init(unsigned int cpu)
{
trace_hardirqs_off();
{
trace_hardirqs_off();
@@
-54,7
+54,7
@@
void __cpuinit sti_secondary_init(unsigned int cpu)
spin_unlock(&boot_lock);
}
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;
{
unsigned long timeout;