diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-11-13 19:07:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 21:14:14 -0500 |
commit | 3b8d108a6e7992a53e0736abefac1b2e07ce98de (patch) | |
tree | 0822d1738e680c21d2b8388d31750823c5f7272d /arch/um | |
parent | cbc24afa82106b67df804cb434739e4382eecd9a (diff) |
[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>
Diffstat (limited to 'arch/um')
-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 | |||
7 | bool | 7 | bool |
8 | default y | 8 | default y |
9 | 9 | ||
10 | # XXX: does UM have a mmu/swap? | ||
11 | config MMU | 10 | config MMU |
12 | bool | 11 | bool |
13 | default y | 12 | default y |
@@ -209,7 +208,8 @@ config MAGIC_SYSRQ | |||
209 | config SMP | 208 | config SMP |
210 | bool "Symmetric multi-processing support (EXPERIMENTAL)" | 209 | bool "Symmetric multi-processing support (EXPERIMENTAL)" |
211 | default n | 210 | default n |
212 | depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN) | 211 | #SMP_BROKEN is for x86_64. |
212 | depends on MODE_TT && EXPERIMENTAL && (!SMP_BROKEN || (BROKEN && SMP_BROKEN)) | ||
213 | help | 213 | help |
214 | This option enables UML SMP support. | 214 | This option enables UML SMP support. |
215 | It is NOT related to having a real SMP box. Not directly, at least. | 215 | It is NOT related to having a real SMP box. Not directly, at least. |