From 3bcf18f75dcd17bd915379f711479f33890763a9 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Sat, 11 May 2013 22:33:19 +0000 Subject: [PATCH] --- yaml --- r: 375555 b: refs/heads/master c: 613e60a66181acc5c8b63268e939622162da2393 h: refs/heads/master i: 375553: 8870ed7a86200a9a907ef7cfbe8d2d5df3fda89f 375551: ce0d482f90f30a5b407ff5adbf308cd28b7453c0 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/pgalloc-64.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b8fc0c4bc2b..515f3498a2fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a3b8d0b833707811011ad14dd12dabf31fa690a +refs/heads/master: 613e60a66181acc5c8b63268e939622162da2393 diff --git a/trunk/arch/powerpc/include/asm/pgalloc-64.h b/trunk/arch/powerpc/include/asm/pgalloc-64.h index 91acb12bac92..b66ae722a8e9 100644 --- a/trunk/arch/powerpc/include/asm/pgalloc-64.h +++ b/trunk/arch/powerpc/include/asm/pgalloc-64.h @@ -186,7 +186,7 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, static inline pgtable_t pmd_pgtable(pmd_t pmd) { - return (pgtable_t)(pmd_val(pmd) & -sizeof(pte_t)*PTRS_PER_PTE); + return (pgtable_t)(pmd_val(pmd) & ~PMD_MASKED_BITS); } static inline pte_t *pte_alloc_one_kernel(struct mm_struct *mm,