diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:53:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 11:53:03 +0200 |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /include/asm-x86/page_32.h | |
| parent | x86: fixup the fallout of the bitops changes (diff) | |
| parent | Slab: Fix memory leak in fallback_alloc() (diff) | |
| download | linux-dev-009b9fc98ddd83f9139fdabb12c0d7a8535d5421.tar.xz linux-dev-009b9fc98ddd83f9139fdabb12c0d7a8535d5421.zip | |
Merge branch 'linus' into x86/threadinfo
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 50b33ebcf851..73ed2e4ebf95 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h @@ -22,7 +22,8 @@ #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 |