diff --git a/[refs] b/[refs]
index d3b8a47373f8..cab0b739934e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc5be20a6454312d395dbf07eb2218090a03ae24
+refs/heads/master: 4c3ff74742b481eaf32d010d072b421c97fd8f08
diff --git a/trunk/arch/x86/um/Kconfig b/trunk/arch/x86/um/Kconfig
index b2b54d2edf53..9926e11a772d 100644
--- a/trunk/arch/x86/um/Kconfig
+++ b/trunk/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