diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/mach-realview/include/mach/smp.h | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.c
Diffstat (limited to 'arch/arm/mach-realview/include/mach/smp.h')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/smp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-realview/include/mach/smp.h b/arch/arm/mach-realview/include/mach/smp.h index d3cd265cb05..c8221b38ee7 100644 --- a/arch/arm/mach-realview/include/mach/smp.h +++ b/arch/arm/mach-realview/include/mach/smp.h | |||
| @@ -2,14 +2,13 @@ | |||
| 2 | #define ASMARM_ARCH_SMP_H | 2 | #define ASMARM_ARCH_SMP_H |
| 3 | 3 | ||
| 4 | #include <asm/hardware/gic.h> | 4 | #include <asm/hardware/gic.h> |
| 5 | #include <asm/smp_mpidr.h> | ||
| 6 | 5 | ||
| 7 | /* | 6 | /* |
| 8 | * We use IRQ1 as the IPI | 7 | * We use IRQ1 as the IPI |
| 9 | */ | 8 | */ |
| 10 | static inline void smp_cross_call(const struct cpumask *mask) | 9 | static inline void smp_cross_call(const struct cpumask *mask, int ipi) |
| 11 | { | 10 | { |
| 12 | gic_raise_softirq(mask, 1); | 11 | gic_raise_softirq(mask, ipi); |
| 13 | } | 12 | } |
| 14 | 13 | ||
| 15 | #endif | 14 | #endif |