Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 85977376c73b7712ed3618888ade126075888c06

Authored by Paolo 'Blaisorblade' Giarrusso
Committed by Linus Torvalds
1 parent 3b8d108a6e
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: fixups for "reuse i386 cpu-specific tuning" 

A few fixups - show the new submenu only for x86 subarchitecture (it does not
make sense to show it for x86_64 users) and remove X86_CMPXCHG, which is now a
duplicate of Kconfig.i386, even though Kconfig doesn't complain (we also miss
the dependency on !M386 CPU).

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 2 changed files with 6 additions and 11 deletions Side-by-side Diff

... ... @@ -35,12 +35,6 @@
35 35 bool
36 36 default y
37 37  
38   -menu "Host processor type and features"
39   -
40   -source "arch/i386/Kconfig.cpu"
41   -
42   -endmenu
43   -
44 38 menu "UML-specific options"
45 39  
46 40 config MODE_TT
arch/um/Kconfig.i386
Diff comments   View file @ 8597737
  1 +menu "Host processor type and features"
  2 +
  3 +source "arch/i386/Kconfig.cpu"
  4 +
  5 +endmenu
  6 +
1 7 config UML_X86
2 8 bool
3 9 default y
... ... @@ -40,10 +46,6 @@
40 46 default y
41 47  
42 48 config ARCH_REUSE_HOST_VSYSCALL_AREA
43   - bool
44   - default y
45   -
46   -config X86_CMPXCHG
47 49 bool
48 50 default y