Commit c4687b15 authored Jul 24, 2015 by Alex Smith Committed by Ralf Baechle Sep 03, 2015

MIPS: Fix definition of pgprot_writecombine()



If pgprot_writecombine is not #defined, asm-generic/pgtable.h will try
to provide a default implementation by #defining it to pgprot_noncached.
However our implementation is an inline function rather than a #define,
so it was never actually used because of the #define in generic code.

Add "#define pgprot_writecombine pgprot_writecombine" to prevent generic
code from re-defining it.

Signed-off-by: Alex Smith <alex.smith@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/10767/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 0ce3417e

arch/mips/include/asm/pgtable.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -393,6 +393,8 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
		return __pgprot(prot);
		}

		#define pgprot_writecombine pgprot_writecombine

		static inline pgprot_t pgprot_writecombine(pgprot_t _prot)
		{
		unsigned long prot = pgprot_val(_prot);