diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /include/asm-um/pgtable-2level.h | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-um/pgtable-2level.h')
| -rw-r--r-- | include/asm-um/pgtable-2level.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-um/pgtable-2level.h b/include/asm-um/pgtable-2level.h index 172a75fde512..f534b73e753e 100644 --- a/include/asm-um/pgtable-2level.h +++ b/include/asm-um/pgtable-2level.h | |||
| @@ -41,9 +41,6 @@ static inline void pgd_mkuptodate(pgd_t pgd) { } | |||
| 41 | #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot)) | 41 | #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot)) |
| 42 | #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot)) | 42 | #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot)) |
| 43 | 43 | ||
| 44 | #define pmd_page_vaddr(pmd) \ | ||
| 45 | ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK)) | ||
| 46 | |||
| 47 | /* | 44 | /* |
| 48 | * Bits 0 through 4 are taken | 45 | * Bits 0 through 4 are taken |
| 49 | */ | 46 | */ |