From: Richard Weinberger <richard@nod.at>
To: linux-arch@vger.kernel.org, arnd@arndb.de, linux-kernel@vger.kernel.org
Cc: Richard Weinberger <richard@nod.at>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 02/27] powerpc: Override defaults from generic/tlb.h
Date: Wed, 14 May 2014 20:59:34 +0200 [thread overview]
Message-ID: <1400093999-18703-3-git-send-email-richard@nod.at> (raw)
In-Reply-To: <1400093999-18703-1-git-send-email-richard@nod.at>
Make sure to not conflict with the defaults provided
by generic/tlb.h.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
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
next prev parent reply other threads:[~2014-05-14 19:00 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-14 18:59 Consolidate tlb.h Richard Weinberger
2014-05-14 18:59 ` [PATCH 01/27] arm64: Override defaults from generic/tlb.h Richard Weinberger
2014-05-15 9:34 ` Catalin Marinas
2014-05-15 9:37 ` Richard Weinberger
2014-05-14 18:59 ` Richard Weinberger [this message]
2014-05-14 18:59 ` [PATCH 03/27] generic/tlb.h: Move common defines into generic tlb.h Richard Weinberger
2014-05-14 18:59 ` [PATCH 04/27] alpha: Use " Richard Weinberger
2014-05-14 19:05 ` Rik van Riel
2014-05-14 18:59 ` [PATCH 05/27] arc: Use common bits from " Richard Weinberger
2014-05-15 8:22 ` Vineet Gupta
2014-05-14 18:59 ` [PATCH 06/27] avr32: " Richard Weinberger
2014-05-14 18:59 ` [PATCH 07/27] blackfin: Use " Richard Weinberger
2014-05-14 18:59 ` [PATCH 08/27] c6x: " Richard Weinberger
2014-05-14 19:35 ` Mark Salter
2014-05-14 18:59 ` [PATCH 09/27] cris: Use common bits from " Richard Weinberger
2014-05-15 7:51 ` Jesper Nilsson
2014-05-14 18:59 ` [PATCH 10/27] frv: " Richard Weinberger
2014-05-14 18:59 ` [PATCH 11/27] hexagon: " Richard Weinberger
2014-05-20 23:58 ` rkuo
2014-05-14 18:59 ` [PATCH 12/27] m32r: Use " Richard Weinberger
2014-05-14 19:05 ` Rik van Riel
2014-05-14 18:59 ` [PATCH 13/27] m68k: Use common bits from " Richard Weinberger
2014-05-14 19:19 ` Geert Uytterhoeven
2014-05-14 19:26 ` Richard Weinberger
2014-05-14 19:34 ` Geert Uytterhoeven
2014-05-14 20:57 ` Richard Weinberger
2014-05-15 9:49 ` Geert Uytterhoeven
2014-05-14 18:59 ` [PATCH 14/27] metag: " Richard Weinberger
2014-05-15 8:59 ` James Hogan
2014-05-14 18:59 ` [PATCH 15/27] microblaze: Use " Richard Weinberger
2014-05-14 18:59 ` [PATCH 16/27] mips: Use common bits from " Richard Weinberger
2014-05-15 18:02 ` Leonid Yegoshin
2014-05-15 18:31 ` Richard Weinberger
2014-05-27 9:17 ` Ralf Baechle
2014-05-14 18:59 ` [PATCH 17/27] mn10300: Use " Richard Weinberger
2014-05-14 18:59 ` [PATCH 18/27] openrisc: " Richard Weinberger
2014-05-14 18:59 ` [PATCH 19/27] parisc: Use common bits from " Richard Weinberger
2014-05-14 18:59 ` [PATCH 20/27] powerpc: " Richard Weinberger
2014-05-14 18:59 ` [PATCH 21/27] score: Use " Richard Weinberger
2014-05-14 18:59 ` [PATCH 22/27] sh: Use common bits from " Richard Weinberger
2014-05-14 18:59 ` [PATCH 23/27] sparc: " Richard Weinberger
2014-05-14 19:55 ` Sam Ravnborg
2014-05-14 20:04 ` Richard Weinberger
2014-05-14 20:22 ` Sam Ravnborg
2014-05-14 20:27 ` Richard Weinberger
2014-05-15 3:13 ` Guenter Roeck
2014-05-14 18:59 ` [PATCH 24/27] tile: Use " Richard Weinberger
2014-05-14 18:59 ` [PATCH 25/27] unicore32: Use common bits from " Richard Weinberger
2014-05-21 9:27 ` 回复： " 管雪涛
2014-05-14 18:59 ` [PATCH 26/27] x86: " Richard Weinberger
2014-05-21 20:57 ` H. Peter Anvin
2014-05-14 18:59 ` [PATCH 27/27] xtensa: " Richard Weinberger
2014-05-15 8:32 ` Consolidate tlb.h Peter Zijlstra
2014-05-15 8:48 ` Richard Weinberger
2014-05-15 9:08 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400093999-18703-3-git-send-email-richard@nod.at \
--to=richard@nod.at \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).