aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-02-11 06:15:50 -0500
committerRichard Weinberger <richard@nod.at>2012-03-25 00:29:56 +0100
commit4c3ff74742b481eaf32d010d072b421c97fd8f08 (patch)
tree6a2728ca25d2cba5d09de91325f7779a7c6ae03d /arch/x86
parentum: most of the SUBARCH uses can be killed (diff)
downloadlinux-dev-4c3ff74742b481eaf32d010d072b421c97fd8f08.tar.xz
linux-dev-4c3ff74742b481eaf32d010d072b421c97fd8f08.zip
um: allow SUBARCH=x86
nicked from patch by dwmw2 back in July Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to '')
-rw-r--r--arch/x86/um/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig
index b2b54d2edf53..9926e11a772d 100644
--- a/arch/x86/um/Kconfig
+++ b/arch/x86/um/Kconfig
@@ -15,8 +15,8 @@ config UML_X86
select GENERIC_FIND_FIRST_BIT
config 64BIT
- bool
- default SUBARCH = "x86_64"
+ bool "64-bit kernel" if SUBARCH = "x86"
+ default SUBARCH != "i386"
config X86_32
def_bool !64BIT