diff --git a/[refs] b/[refs]
index 533abc52c6db..14a852ea3f92 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 116780fc04d9f6cd3ceeab0251681f1dfda53367
+refs/heads/master: f6ca8083c261864fc9de94ef99c3311ea259c5c3
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index b6b2df40ca78..ea70359b02d0 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -454,7 +454,8 @@ source "drivers/firmware/Kconfig"
 
 choice
 	prompt "High Memory Support"
-	default NOHIGHMEM
+	default HIGHMEM4G if !X86_NUMAQ
+	default HIGHMEM64G if X86_NUMAQ
 
 config NOHIGHMEM
 	bool "off"