diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 09:41:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 09:41:36 -0500 |
| commit | cbe9ee00cea58d1f77b172fe22a51080e90877f2 (patch) | |
| tree | bef908ddde094287e57fc0a5a3bb3f84fee6a767 /arch/x86/Kconfig | |
| parent | 0bd7b79851d0f74b24a9ce87d088f2e7c718f668 (diff) | |
| parent | 10db4ef7b9a65b86e4d047671a1886f4c101a859 (diff) | |
Merge branch 'x86/urgent' into x86/cleanups
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 986e09a76b86..3cf457f90e8e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -167,9 +167,12 @@ config GENERIC_PENDING_IRQ | |||
| 167 | config X86_SMP | 167 | config X86_SMP |
| 168 | bool | 168 | bool |
| 169 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) | 169 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) |
| 170 | select USE_GENERIC_SMP_HELPERS | ||
| 171 | default y | 170 | default y |
| 172 | 171 | ||
| 172 | config USE_GENERIC_SMP_HELPERS | ||
| 173 | def_bool y | ||
| 174 | depends on SMP | ||
| 175 | |||
| 173 | config X86_32_SMP | 176 | config X86_32_SMP |
| 174 | def_bool y | 177 | def_bool y |
| 175 | depends on X86_32 && SMP | 178 | depends on X86_32 && SMP |