diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/mach-s5pv310/include/mach/smp.h | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
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/mach-s5pv310/include/mach/smp.h')
| -rw-r--r-- | arch/arm/mach-s5pv310/include/mach/smp.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/smp.h b/arch/arm/mach-s5pv310/include/mach/smp.h index e1cc6a251c6a..393ccbd52c4a 100644 --- a/arch/arm/mach-s5pv310/include/mach/smp.h +++ b/arch/arm/mach-s5pv310/include/mach/smp.h | |||
| @@ -7,14 +7,13 @@ | |||
| 7 | #define ASM_ARCH_SMP_H __FILE__ | 7 | #define ASM_ARCH_SMP_H __FILE__ |
| 8 | 8 | ||
| 9 | #include <asm/hardware/gic.h> | 9 | #include <asm/hardware/gic.h> |
| 10 | #include <asm/smp_mpidr.h> | ||
| 11 | 10 | ||
| 12 | /* | 11 | /* |
| 13 | * We use IRQ1 as the IPI | 12 | * We use IRQ1 as the IPI |
| 14 | */ | 13 | */ |
| 15 | static inline void smp_cross_call(const struct cpumask *mask) | 14 | static inline void smp_cross_call(const struct cpumask *mask, int ipi) |
| 16 | { | 15 | { |
| 17 | gic_raise_softirq(mask, 1); | 16 | gic_raise_softirq(mask, ipi); |
| 18 | } | 17 | } |
| 19 | 18 | ||
| 20 | #endif | 19 | #endif |