From 0a2e9829dfe0f4ee55fa73fece5a70f0eb5a4136 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 3 Jul 2009 08:44:36 -0500 Subject: [PATCH] x86: disable maxcpus ion RT for now commit ba18c86f5cd0d5eefa9c580320f06742188bd66b in tip. Signed-off-by: Thomas Gleixner Signed-off-by: Paul Gortmaker --- arch/x86/Kconfig | 2 +- arch/x86/Kconfig.debug | 1 + lib/Kconfig | 1 + 3 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 555b7d4..a06a01e 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -755,7 +755,7 @@ config IOMMU_API config MAXSMP bool "Configure Maximum number of SMP Processors and NUMA Nodes" - depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL + depends on 0 && X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL select CPUMASK_OFFSTACK default n ---help--- diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 4fd6ace..93dc8cc 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug @@ -76,6 +76,7 @@ config DEBUG_PER_CPU_MAPS bool "Debug access to per_cpu maps" depends on DEBUG_KERNEL depends on SMP + depends on !PREEMPT_RT default n ---help--- Say Y to verify that the per_cpu map being accessed has diff --git a/lib/Kconfig b/lib/Kconfig index 170d8ca..35e7f24 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -186,6 +186,7 @@ config HAVE_LMB config CPUMASK_OFFSTACK bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS + depends on !PREEMPT_RT && BROKEN help Use dynamic allocation for cpumask_var_t, instead of putting them on the stack. This is a bit more expensive, but avoids -- 1.7.0.4