diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /arch/x86/Kconfig | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7191b6eb16d8..97a95dfd1181 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1219,8 +1219,8 @@ config NUMA_EMU | |||
| 1219 | 1219 | ||
| 1220 | config NODES_SHIFT | 1220 | config NODES_SHIFT |
| 1221 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP | 1221 | int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP |
| 1222 | range 1 9 | 1222 | range 1 10 |
| 1223 | default "9" if MAXSMP | 1223 | default "10" if MAXSMP |
| 1224 | default "6" if X86_64 | 1224 | default "6" if X86_64 |
| 1225 | default "4" if X86_NUMAQ | 1225 | default "4" if X86_NUMAQ |
| 1226 | default "3" | 1226 | default "3" |