x86/mm for v2.6.32
Linus,
Please pull the latest x86-mm-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-mm-for-linus
Thanks,
Ingo
------------------>
Akinobu Mita (1):
x86: Clean up dump_pagetable()
Figo.zhang (2):
x86, pgtable.h: Clean up types
x86, highmem_32.c: Clean up comment
arch/x86/include/asm/pgtable.h | 16 ++++++------ arch/x86/mm/fault.c | 51 ++++++++++++++++----------------------- arch/x86/mm/highmem_32.c | 2 +- 3 files changed, 30 insertions(+), 39 deletions(-)
arch/x86/include/asm/pgtable.h +8 -8
@@ -134,6 +134,11 @@ static inline unsigned long pte_pfn(pte_t pte)return (pte_val (pte) &PTE_PFN_MASK ) >>PAGE_SHIFT ; } +static inline unsigned long pmd_pfn (pmd_t pmd) +{ +return (pmd_val (pmd) &PTE_PFN_MASK ) >>PAGE_SHIFT ; +} +#define pte_page (pte) pfn_to_page(pte_pfn(pte))static inline int pmd_large (pmd_t pte)
@@ -351,7 +356,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd)* this macro returns the index of the entry in the pmd page which would * control the given virtual address */ -static inline unsigned pmd_index (unsigned long address) +static inline unsigned long pmd_index (unsigned long address) {return (address >>PMD_SHIFT ) & (PTRS_PER_PMD -1 ); }
@@ -371,7 +376,7 @@ static inline unsigned pmd_index(unsigned long address)* this function returns the index of the entry in the pte page which would * control the given virtual address */ -static inline unsigned pte_index (unsigned long address) +static inline unsigned long pte_index (unsigned long address) {return (address >>PAGE_SHIFT ) & (PTRS_PER_PTE -1 ); }
@@ -422,11 +427,6 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)return (pmd_t *)pud_page_vaddr (*pud) +pmd_index (address); } -static inline unsigned long pmd_pfn (pmd_t pmd) -{ -return (pmd_val (pmd) &PTE_PFN_MASK ) >>PAGE_SHIFT ; -} -static inline int pud_large (pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
@@ -462,7 +462,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)#define pgd_page (pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)/* to find an entry in a page-table-directory. */ -static inline unsigned pud_index (unsigned long address) +static inline unsigned long pud_index (unsigned long address) {return (address >>PUD_SHIFT ) & (PTRS_PER_PUD -1 ); }
arch/x86/mm/fault.c +21 -30
79 lines not on this page · raw message
arch/x86/mm/highmem_32.c +1 -1
@@ -24,7 +24,7 @@ void kunmap(struct page *page)* no global lock is needed and because the kmap code must perform a global TLB * invalidation when the kmap pool wraps. * -* However when holding an atomic kmap is is not legal to sleep, so atomic +* However when holding an atomic kmap it is not legal to sleep, so atomic * kmaps are appropriate for short, tight code paths only. */ void *kmap_atomic_prot (struct page *page,enum km_type type,pgprot_t prot)