Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3b8d108a6e7992a53e0736abefac1b2e07ce98de

Authored by Paolo 'Blaisorblade' Giarrusso
Committed by Linus Torvalds
1 parent cbc24afa82
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -7,7 +7,6 @@
7 7 bool
8 8 default y
9 9  
10   -# XXX: does UM have a mmu/swap?
11 10 config MMU
12 11 bool
13 12 default y
... ... @@ -209,7 +208,8 @@
209 208 config SMP
210 209 bool "Symmetric multi-processing support (EXPERIMENTAL)"
211 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 213 help
214 214 This option enables UML SMP support.
215 215 It is NOT related to having a real SMP box. Not directly, at least.