Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[karo-tx-linux.git] / arch / x86 / include / asm / page_64_types.h

diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 8d382d3abf38cf9ec0be9c6164589d431017fc41..7639dbf5d223bda6c0e7537ae44858d6bef805df 100644 (file)
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -41,7 +41,7 @@
 
 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
 #define __PHYSICAL_MASK_SHIFT  46
-#define __VIRTUAL_MASK_SHIFT   48
+#define __VIRTUAL_MASK_SHIFT   47
 
 /*
  * Kernel image size is limited to 512 MB (see level2_kernel_pgt in