blob: 9e43bfd76aea79b58e42962972243667aae92eb5 [file] [log] [blame]
From 09ea570437bd05ff920775576bc8f0579964e687 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
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 <tglx@linutronix.de>
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0c6f553..8b29139 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -720,7 +720,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 97b136f..38dc31e 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -183,6 +183,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.1.1