diff --git a/[refs] b/[refs]
index 1ced8e87c45e..0f99ed6be4bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 911b0ad25d167fede6aadc05065b414ec7ab5086
+refs/heads/master: 4be68a783d25b4dab0ef4077a4c6b13161a2d6e4
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index d86c865a7cd2..0afec8566e7b 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -442,6 +442,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
+	depends on X86_CMPXCHG64
 	help
 	  Select this if you have a 32-bit processor and more than 4
 	  gigabytes of physical RAM.