diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-09-03 18:57:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:22 -0400 |
commit | 02edeb586ae4cdd17778923674700edb732a4741 (patch) | |
tree | fe55ef9ca0d35901b835984026d76387aa2311b8 | |
parent | 13abf8130139c2ccd4962a7e5a8902be5e6cb5a7 (diff) |
[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>
-rw-r--r-- | arch/um/Kconfig | 2 | ||||
-rw-r--r-- | arch/um/Kconfig.x86_64 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index d5e22f084880..684e1f8b2755 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -196,7 +196,7 @@ config HOST_2G_2G | |||
196 | config SMP | 196 | config SMP |
197 | bool "Symmetric multi-processing support (EXPERIMENTAL)" | 197 | bool "Symmetric multi-processing support (EXPERIMENTAL)" |
198 | default n | 198 | default n |
199 | depends on MODE_TT && EXPERIMENTAL | 199 | depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN) |
200 | help | 200 | help |
201 | This option enables UML SMP support. | 201 | This option enables UML SMP support. |
202 | It is NOT related to having a real SMP box. Not directly, at least. | 202 | 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 6e5357c5bcfb..bd35e59419c8 100644 --- a/arch/um/Kconfig.x86_64 +++ b/arch/um/Kconfig.x86_64 | |||
@@ -37,3 +37,7 @@ config ARCH_HAS_SC_SIGNALS | |||
37 | config ARCH_REUSE_HOST_VSYSCALL_AREA | 37 | config ARCH_REUSE_HOST_VSYSCALL_AREA |
38 | bool | 38 | bool |
39 | default n | 39 | default n |
40 | |||
41 | config SMP_BROKEN | ||
42 | bool | ||
43 | default y | ||