diff options
| author | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2008-06-24 11:43:00 +0200 |
| commit | 19fd426a18b48a0446ba4b54ac66264916dcb7f3 (patch) | |
| tree | b9e0f2bc35e746c14f5e5e5519ed79f1eb4b0f98 /include/asm-x86/page_32.h | |
| parent | e8183c2452041326c95258ecc7865b6fcd91c730 (diff) | |
| parent | 62786b9e81a2dbe9c073a2ade52d33a2627d6d85 (diff) | |
Merge branch 'master' into for_mm
Diffstat (limited to 'include/asm-x86/page_32.h')
| -rw-r--r-- | include/asm-x86/page_32.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index 424e82f8ae2..ccf0ba3c3ab 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h @@ -14,7 +14,8 @@ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) #ifdef CONFIG_X86_PAE -#define __PHYSICAL_MASK_SHIFT 36 +/* 44=32+12, the limit we can fit into an unsigned long pfn */ +#define __PHYSICAL_MASK_SHIFT 44 #define __VIRTUAL_MASK_SHIFT 32 #define PAGETABLE_LEVELS 3 |