diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:30:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:26 -0500 |
commit | 300ecf59c0ca2c09fb7fde7dff986a7306e95361 (patch) | |
tree | b4706c9c5465204212fd221e9fa72ce1c507e734 /include/asm-um/pgtable.h | |
parent | d83ecf083a2163705f5ebcede4637a955eb7b964 (diff) |
UML - Fix build in 2.6.24-rc2-mm1
The earlier pgtable.h tidying patch made things a bit too tidy. Add
back a header which is needed in VMALLOC_START and friend. Also add
back a definition of pmd_page_vaddr, which is needed on x86_64.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-um/pgtable.h')
-rw-r--r-- | include/asm-um/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h index cb0d2048eca6..1e7fc0085596 100644 --- a/include/asm-um/pgtable.h +++ b/include/asm-um/pgtable.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #define __UM_PGTABLE_H | 9 | #define __UM_PGTABLE_H |
10 | 10 | ||
11 | #include "linux/sched.h" | 11 | #include "linux/sched.h" |
12 | #include <asm/fixmap.h> | ||
12 | 13 | ||
13 | #define _PAGE_PRESENT 0x001 | 14 | #define _PAGE_PRESENT 0x001 |
14 | #define _PAGE_NEWPAGE 0x002 | 15 | #define _PAGE_NEWPAGE 0x002 |
@@ -308,6 +309,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) | |||
308 | * this macro returns the index of the entry in the pmd page which would | 309 | * this macro returns the index of the entry in the pmd page which would |
309 | * control the given virtual address | 310 | * control the given virtual address |
310 | */ | 311 | */ |
312 | #define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) | ||
311 | #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) | 313 | #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) |
312 | 314 | ||
313 | /* | 315 | /* |