x86: fix pte_modify() bug

fix sign extension bug in PTE_MASK / _PTE_CHG_MASK.

this resolves the following bootup crash on PAE systems:

[   94.710726] init[1]: segfault at 00000004 ip 49471cbb sp bff0c6c0 error 4
[   94.717764] init[1]: segfault at 00000004 ip 49471cbb sp bff0c6c0 error 4
[   94.724772] init[1]: segfault at 00000004 ip 49471cbb sp bff0c6c0 error 4
[   94.731777] init[1]: segfault at 00000004 ip 49471cbb sp bff0c6c0 error 4

Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index 3a00d0d9dfd35c154894809d4a1dcc24fc83395a..91920565a575d5377961b2d8497bcbb0106cc6f8 100644 (file)
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -11,7 +11,7 @@
 #ifdef __KERNEL__
 
 #define PHYSICAL_PAGE_MASK     (PAGE_MASK & __PHYSICAL_MASK)
-#define PTE_MASK               PHYSICAL_PAGE_MASK
+#define PTE_MASK               (_AT(long, PHYSICAL_PAGE_MASK))
 
 #define LARGE_PAGE_SIZE                (_AC(1,UL) << PMD_SHIFT)
 #define LARGE_PAGE_MASK                (~(LARGE_PAGE_SIZE-1))