git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
include
/
mach
/
smp.h
diff --git
a/arch/arm/mach-ux500/include/mach/smp.h
b/arch/arm/mach-ux500/include/mach/smp.h
index
197e841
..
ca2b15b
100644
(file)
--- a/
arch/arm/mach-ux500/include/mach/smp.h
+++ b/
arch/arm/mach-ux500/include/mach/smp.h
@@
-10,7
+10,6
@@
#define ASMARM_ARCH_SMP_H
#include <asm/hardware/gic.h>
#define ASMARM_ARCH_SMP_H
#include <asm/hardware/gic.h>
-#include <asm/smp_mpidr.h>
/* This is required to wakeup the secondary core */
extern void u8500_secondary_startup(void);
/* This is required to wakeup the secondary core */
extern void u8500_secondary_startup(void);
@@
-18,8
+17,8
@@
extern void u8500_secondary_startup(void);
/*
* We use IRQ1 as the IPI
*/
/*
* We use IRQ1 as the IPI
*/
-static inline void smp_cross_call(const struct cpumask *mask)
+static inline void smp_cross_call(const struct cpumask *mask
, int ipi
)
{
{
- gic_raise_softirq(mask,
1
);
+ gic_raise_softirq(mask,
ipi
);
}
#endif
}
#endif