summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/plat/smp.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-06 23:32:52 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-01-06 23:32:52 +0100
commit4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch)
treef41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/plat-omap/include/plat/smp.h
parentMerge branch 'clksrc' into devel (diff)
parentMerge branch 'smp' into misc (diff)
downloadlinux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.tar.xz
linux-4073723acb9cdcdbe4df9c0e0c376c65d1697e43.zip
Merge branch 'misc' into devel
Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/plat-omap/include/plat/smp.h')
-rw-r--r--arch/arm/plat-omap/include/plat/smp.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/include/plat/smp.h b/arch/arm/plat-omap/include/plat/smp.h
index ecd6a488c497..7a10257909ef 100644
--- 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>
-#include <asm/smp_mpidr.h>
/* 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
*/
-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