[PATCH 02/27] powerpc: Override defaults from generic/tlb.h
From: Richard Weinberger <richard@nod.at>
Date: 2014-05-14 19:00:50
Also in:
linux-arch, lkml
Subsystem:
linux for powerpc (32-bit and 64-bit), mmu gather and tlb invalidation, the rest · Maintainers:
Madhavan Srinivasan, Will Deacon, "Aneesh Kumar K.V", Andrew Morton, Nick Piggin, Peter Zijlstra, Linus Torvalds
Make sure to not conflict with the defaults provided by generic/tlb.h. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <redacted> Cc: Richard Weinberger <richard@nod.at> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Richard Weinberger <richard@nod.at> --- arch/powerpc/include/asm/pgalloc.h | 1 - arch/powerpc/include/asm/tlb.h | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/pgalloc.h b/arch/powerpc/include/asm/pgalloc.h
index e9a9f60..5fddba7 100644
--- a/arch/powerpc/include/asm/pgalloc.h
+++ b/arch/powerpc/include/asm/pgalloc.h@@ -3,7 +3,6 @@ #ifdef __KERNEL__ #include <linux/mm.h> -#include <asm-generic/tlb.h> #ifdef CONFIG_PPC_BOOK3E extern void tlb_flush_pgtable(struct mmu_gather *tlb, unsigned long address);
diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h
index e2b428b..392e5ef 100644
--- a/arch/powerpc/include/asm/tlb.h
+++ b/arch/powerpc/include/asm/tlb.h@@ -30,6 +30,10 @@ extern void tlb_flush(struct mmu_gather *tlb); +/* These defines are needed to override the defaults from asm-generic/tlb.h */ +#define tlb_flush tlb_flush +#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry + /* Get the generic bits... */ #include <asm-generic/tlb.h>
--
1.8.4.2