diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-02-04 22:30:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:26 -0800 |
| commit | 300ecf59c0ca2c09fb7fde7dff986a7306e95361 (patch) | |
| tree | b4706c9c5465204212fd221e9fa72ce1c507e734 /include/asm-um | |
| parent | d83ecf083a2163705f5ebcede4637a955eb7b964 (diff) | |
| download | kernel_samsung_aries-300ecf59c0ca2c09fb7fde7dff986a7306e95361.zip kernel_samsung_aries-300ecf59c0ca2c09fb7fde7dff986a7306e95361.tar.gz kernel_samsung_aries-300ecf59c0ca2c09fb7fde7dff986a7306e95361.tar.bz2 | |
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')
| -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 cb0d204..1e7fc00 100644 --- a/include/asm-um/pgtable.h +++ b/include/asm-um/pgtable.h @@ -9,6 +9,7 @@ #define __UM_PGTABLE_H #include "linux/sched.h" +#include <asm/fixmap.h> #define _PAGE_PRESENT 0x001 #define _PAGE_NEWPAGE 0x002 @@ -308,6 +309,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) * this macro returns the index of the entry in the pmd page which would * control the given virtual address */ +#define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) /* |