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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
smp.h
diff --git
a/arch/arm/plat-omap/include/plat/smp.h
b/arch/arm/plat-omap/include/plat/smp.h
index
ecd6a48
..
7a10257
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/smp.h
+++ b/
arch/arm/plat-omap/include/plat/smp.h
@@
-18,7
+18,6
@@
#define OMAP_ARCH_SMP_H
#include <asm/hardware/gic.h>
#define OMAP_ARCH_SMP_H
#include <asm/hardware/gic.h>
-#include <asm/smp_mpidr.h>
/* Needed for secondary core boot */
extern void omap_secondary_startup(void);
/* Needed for secondary core boot */
extern void omap_secondary_startup(void);
@@
-29,9
+28,9
@@
extern u32 omap_read_auxcoreboot0(void);
/*
* We use Soft IRQ1 as the IPI
*/
/*
* We use Soft 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