diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-23 05:53:03 -0400 |
| commit | 009b9fc98ddd83f9139fdabb12c0d7a8535d5421 (patch) | |
| tree | f7d3e182407d2ebe50a9b8db6361ac910027a1cf /include/asm-x86/page_32.h | |
| parent | 3711ccb07b7f0a13f4f1aa16a8fdca9c930f21ca (diff) | |
| parent | 481c5346d0981940ee63037eb53e4e37b0735c10 (diff) | |
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 @@ | |||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #ifdef CONFIG_X86_PAE | 24 | #ifdef CONFIG_X86_PAE |
| 25 | #define __PHYSICAL_MASK_SHIFT 36 | 25 | /* 44=32+12, the limit we can fit into an unsigned long pfn */ |
| 26 | #define __PHYSICAL_MASK_SHIFT 44 | ||
| 26 | #define __VIRTUAL_MASK_SHIFT 32 | 27 | #define __VIRTUAL_MASK_SHIFT 32 |
| 27 | #define PAGETABLE_LEVELS 3 | 28 | #define PAGETABLE_LEVELS 3 |
| 28 | 29 | ||