diff options
| author | Alex Smith <[email protected]> | 2015-07-24 16:16:10 +0100 |
|---|---|---|
| committer | Ralf Baechle <[email protected]> | 2015-09-03 12:08:00 +0200 |
| commit | c4687b15a8487e8ef028814a301a88958baf72bc (patch) | |
| tree | 6d9ad130640402ce6e2088da688bfd6ae85adeb5 | |
| parent | 0ce3417e84825155e2d74ac65e133bf7ba995a74 (diff) | |
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 <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/10767/
Signed-off-by: Ralf Baechle <[email protected]>
| -rw-r--r-- | 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 ae8569475264..8957f15e21ec 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -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); |