diff --git a/[refs] b/[refs]
index f685b4e7ef7c..01f01b2994e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 039e13890b0615cb8c5c04b6afa84d676e24c761
+refs/heads/master: bfc39061d3dbf812e6a78f9529a548e5f0050c64
diff --git a/trunk/arch/um/Kconfig.x86 b/trunk/arch/um/Kconfig.x86
index 5ee328099c63..62f21156aaa4 100644
--- a/trunk/arch/um/Kconfig.x86
+++ b/trunk/arch/um/Kconfig.x86
@@ -19,6 +19,9 @@ config X86_32
 	def_bool !64BIT
 	select HAVE_AOUT
 
+config X86_64
+	def_bool 64BIT
+
 config RWSEM_XCHGADD_ALGORITHM
 	def_bool X86_XADD