aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2005-09-03 15:57:33 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 00:06:22 -0700
commit02edeb586ae4cdd17778923674700edb732a4741 (patch)
treefe55ef9ca0d35901b835984026d76387aa2311b8 /arch
parent13abf8130139c2ccd4962a7e5a8902be5e6cb5a7 (diff)
downloadlinux-2.6.34-ux500-02edeb586ae4cdd17778923674700edb732a4741.tar.gz
[PATCH] uml: mark SMP on UML/x86_64 as broken
Noticed by Al Viro <viro@parcelfarce.linux.theplanet.co.uk> - SMP on x86_64 is fundamentally broken due to UML's reuse of the host arch's percpu stuff. This is OK on x86, but the x86_64 pda stuff just won't work for UML. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Kconfig2
-rw-r--r--arch/um/Kconfig.x86_644
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index d5e22f08488..684e1f8b275 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -196,7 +196,7 @@ config HOST_2G_2G
config SMP
bool "Symmetric multi-processing support (EXPERIMENTAL)"
default n
- depends on MODE_TT && EXPERIMENTAL
+ depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN)
help
This option enables UML SMP support.
It is NOT related to having a real SMP box. Not directly, at least.
diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
index 6e5357c5bcf..bd35e59419c 100644
--- a/arch/um/Kconfig.x86_64
+++ b/arch/um/Kconfig.x86_64
@@ -37,3 +37,7 @@ config ARCH_HAS_SC_SIGNALS
config ARCH_REUSE_HOST_VSYSCALL_AREA
bool
default n
+
+config SMP_BROKEN
+ bool
+ default y