diff options
author | Amerigo Wang <amwang@redhat.com> | 2011-01-12 19:59:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:08 -0500 |
commit | 351f8f8e6499ae4fff40f5e3a8fe16d9e1903646 (patch) | |
tree | 9393c8d3a6a1eaa9dba50932eb6de3017a8afe86 /arch | |
parent | b8cb464e4a8abc60ad5a43e0375fec8a3c728167 (diff) |
kernel: clean up USE_GENERIC_SMP_HELPERS
For arch which needs USE_GENERIC_SMP_HELPERS, it has to select
USE_GENERIC_SMP_HELPERS, rather than leaving a choice to user, since they
don't provide their own implementions.
Also, move on_each_cpu() to kernel/smp.c, it is strange to put it in
kernel/softirq.c.
For arch which doesn't use USE_GENERIC_SMP_HELPERS, e.g. blackfin, only
on_each_cpu() is compiled.
Signed-off-by: Amerigo Wang <amwang@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mn10300/Kconfig | 6 | ||||
-rw-r--r-- | arch/x86/Kconfig | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig index 41ba38513c89..8ed41cf2b08d 100644 --- a/arch/mn10300/Kconfig +++ b/arch/mn10300/Kconfig | |||
@@ -203,6 +203,7 @@ endmenu | |||
203 | config SMP | 203 | config SMP |
204 | bool "Symmetric multi-processing support" | 204 | bool "Symmetric multi-processing support" |
205 | default y | 205 | default y |
206 | select USE_GENERIC_SMP_HELPERS | ||
206 | depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050 | 207 | depends on MN10300_PROC_MN2WS0038 || MN10300_PROC_MN2WS0050 |
207 | ---help--- | 208 | ---help--- |
208 | This enables support for systems with more than one CPU. If you have | 209 | This enables support for systems with more than one CPU. If you have |
@@ -226,11 +227,6 @@ config NR_CPUS | |||
226 | depends on SMP | 227 | depends on SMP |
227 | default "2" | 228 | default "2" |
228 | 229 | ||
229 | config USE_GENERIC_SMP_HELPERS | ||
230 | bool | ||
231 | depends on SMP | ||
232 | default y | ||
233 | |||
234 | source "kernel/Kconfig.preempt" | 230 | source "kernel/Kconfig.preempt" |
235 | 231 | ||
236 | config MN10300_CURRENT_IN_E2 | 232 | config MN10300_CURRENT_IN_E2 |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b6fccb07123e..8734db3c5830 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -65,6 +65,7 @@ config X86 | |||
65 | select HAVE_SPARSE_IRQ | 65 | select HAVE_SPARSE_IRQ |
66 | select GENERIC_IRQ_PROBE | 66 | select GENERIC_IRQ_PROBE |
67 | select GENERIC_PENDING_IRQ if SMP | 67 | select GENERIC_PENDING_IRQ if SMP |
68 | select USE_GENERIC_SMP_HELPERS if SMP | ||
68 | 69 | ||
69 | config INSTRUCTION_DECODER | 70 | config INSTRUCTION_DECODER |
70 | def_bool (KPROBES || PERF_EVENTS) | 71 | def_bool (KPROBES || PERF_EVENTS) |
@@ -203,10 +204,6 @@ config HAVE_INTEL_TXT | |||
203 | def_bool y | 204 | def_bool y |
204 | depends on EXPERIMENTAL && DMAR && ACPI | 205 | depends on EXPERIMENTAL && DMAR && ACPI |
205 | 206 | ||
206 | config USE_GENERIC_SMP_HELPERS | ||
207 | def_bool y | ||
208 | depends on SMP | ||
209 | |||
210 | config X86_32_SMP | 207 | config X86_32_SMP |
211 | def_bool y | 208 | def_bool y |
212 | depends on X86_32 && SMP | 209 | depends on X86_32 && SMP |