Commit-ID: 8cd7680d8b7241941fd51d83302677d58b447223 Gitweb: http://git.kernel.org/tip/8cd7680d8b7241941fd51d83302677d58b447223 Author: Ralf Baechle <r...@linux-mips.org> AuthorDate: Thu, 18 Oct 2012 16:51:01 +0200 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Fri, 19 Oct 2012 23:46:11 +0200
MIPS/thp: Add pmd_pgprot() implementation Resolve the semantic conflict between the new THP code on MIPS and the new NUMA code, in linux-next, by adding the pmd_pgprot() method needed by the NUMA code. Reported-by: Stephen Rothwell <s...@canb.auug.org.au> Signed-off-by: Ralf Baechle <r...@linux-mips.org> Cc: Martin Schwidefsky <schwidef...@de.ibm.com> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/20121018145101.ga17...@linux-mips.org Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/mips/include/asm/pgtable.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index c02158b..bbe4cda 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -89,6 +89,8 @@ static inline int is_zero_pfn(unsigned long pfn) extern void paging_init(void); +#define pmd_pgprot(x) __pgprot(pmd_val(x) & ~_PAGE_CHG_MASK) + /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
