diff options
| author | Paolo 'Blaisorblade' Giarrusso | 2005-11-14 01:07:04 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2005-11-14 03:14:14 +0100 |
| commit | 3b8d108a6e7992a53e0736abefac1b2e07ce98de (patch) | |
| tree | 0822d1738e680c21d2b8388d31750823c5f7272d | |
| parent | [PATCH] uml: remove bogus WARN_ON, triggerable harmlessly on a page fault race (diff) | |
| download | kernel-qcow2-linux-3b8d108a6e7992a53e0736abefac1b2e07ce98de.tar.gz kernel-qcow2-linux-3b8d108a6e7992a53e0736abefac1b2e07ce98de.tar.xz kernel-qcow2-linux-3b8d108a6e7992a53e0736abefac1b2e07ce98de.zip | |
[PATCH] uml: micro fixups to arch Kconfig
Remove a stone-age comment (UM *does* have a MMU, i.e. the host), and fix a
dependency (introduced in commit 02edeb586ae4cdd17778923674700edb732a4741) to
do what was intended.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 3b5f47c46907..018f076101f3 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -7,7 +7,6 @@ config UML bool default y -# XXX: does UM have a mmu/swap? config MMU bool default y @@ -209,7 +208,8 @@ config MAGIC_SYSRQ config SMP bool "Symmetric multi-processing support (EXPERIMENTAL)" default n - depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN) + #SMP_BROKEN is for x86_64. + 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. |