linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Weinberger <richard@nod.at>
To: linux-arch@vger.kernel.org, arnd@arndb.de, linux-kernel@vger.kernel.org
Cc: Steve Capper <steve.capper@linaro.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Richard Weinberger <richard@nod.at>,
	Will Deacon <will.deacon@arm.com>, Michal Hocko <mhocko@suse.cz>,
	Catalin Marinas <catalin.marinas@arm.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/27] arm64: Override defaults from generic/tlb.h
Date: Wed, 14 May 2014 20:59:33 +0200	[thread overview]
Message-ID: <1400093999-18703-2-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: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/arm64/include/asm/tlb.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h
index 80e2c08..65a474d 100644
--- a/arch/arm64/include/asm/tlb.h
+++ b/arch/arm64/include/asm/tlb.h
@@ -19,7 +19,14 @@
 #ifndef __ASM_TLB_H
 #define __ASM_TLB_H
 
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
 #define  __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry
+#define tlb_start_vma tlb_start_vma
+#define tlb_end_vma tlb_end_vma
+#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
+#define tlb_flush tlb_flush
+#define __pte_free_tlb __pte_free_tlb
+#define __pmd_free_tlb __pmd_free_tlb
 
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2

WARNING: multiple messages have this Message-ID (diff)
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>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Steve Capper <steve.capper@linaro.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Michal Hocko <mhocko@suse.cz>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/27] arm64: Override defaults from generic/tlb.h
Date: Wed, 14 May 2014 20:59:33 +0200	[thread overview]
Message-ID: <1400093999-18703-2-git-send-email-richard@nod.at> (raw)
Message-ID: <20140514185933.QxnX9txibe6Gi2Lk62rI9hVFrLkZZh2qwaumgZqrbL8@z> (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: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/arm64/include/asm/tlb.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h
index 80e2c08..65a474d 100644
--- a/arch/arm64/include/asm/tlb.h
+++ b/arch/arm64/include/asm/tlb.h
@@ -19,7 +19,14 @@
 #ifndef __ASM_TLB_H
 #define __ASM_TLB_H
 
+/* These defines are needed to override the defaults from asm-generic/tlb.h */
 #define  __tlb_remove_pmd_tlb_entry __tlb_remove_pmd_tlb_entry
+#define tlb_start_vma tlb_start_vma
+#define tlb_end_vma tlb_end_vma
+#define __tlb_remove_tlb_entry __tlb_remove_tlb_entry
+#define tlb_flush tlb_flush
+#define __pte_free_tlb __pte_free_tlb
+#define __pmd_free_tlb __pmd_free_tlb
 
 #include <asm-generic/tlb.h>
 
-- 
1.8.4.2


  reply	other threads:[~2014-05-14 18:59 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-14 18:59 Consolidate tlb.h Richard Weinberger
2014-05-14 18:59 ` Richard Weinberger [this message]
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-15  9:37       ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 02/27] powerpc: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
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 18:59   ` Richard Weinberger
2014-05-14 19:05   ` Rik van Riel
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-14 18:59   ` 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   ` 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 18:59   ` 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-14 18:59   ` 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   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 11/27] hexagon: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-20 23:58   ` rkuo
2014-05-20 23:58     ` rkuo
2014-05-14 18:59 ` [PATCH 12/27] m32r: Use " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 19:05   ` Rik van Riel
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 18:59   ` Richard Weinberger
2014-05-14 19:19   ` Geert Uytterhoeven
2014-05-14 19:19     ` Geert Uytterhoeven
2014-05-14 19:26     ` Richard Weinberger
2014-05-14 19:26       ` Richard Weinberger
2014-05-14 19:34       ` Geert Uytterhoeven
2014-05-14 19:34         ` Geert Uytterhoeven
2014-05-14 20:57         ` Richard Weinberger
2014-05-14 20:57           ` Richard Weinberger
2014-05-15  9:49           ` Geert Uytterhoeven
2014-05-15  9:49             ` Geert Uytterhoeven
2014-05-14 18:59 ` [PATCH 14/27] metag: " Richard Weinberger
     [not found]   ` <1400093999-18703-15-git-send-email-richard-/L3Ra7n9ekc@public.gmane.org>
2014-05-15  8:59     ` James Hogan
2014-05-15  8:59       ` James Hogan
2014-05-14 18:59 ` [PATCH 15/27] microblaze: Use " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 16/27] mips: Use common bits from " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-15 18:02   ` Leonid Yegoshin
2014-05-15 18:31     ` Richard Weinberger
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   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 18/27] openrisc: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 19/27] parisc: Use common bits from " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 20/27] powerpc: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 21/27] score: Use " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 22/27] sh: Use common bits from " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 23/27] sparc: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 19:55   ` Sam Ravnborg
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:22         ` Sam Ravnborg
2014-05-14 20:27         ` Richard Weinberger
2014-05-14 20:27           ` Richard Weinberger
2014-05-15  3:13           ` Guenter Roeck
2014-05-15  3:13             ` Guenter Roeck
2014-05-14 18:59 ` [PATCH 24/27] tile: Use " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-14 18:59 ` [PATCH 25/27] unicore32: Use common bits from " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-21  9:27   ` 回复: " 管雪涛
2014-05-21  9:27     ` 管雪涛
2014-05-14 18:59 ` [PATCH 26/27] x86: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-21 20:57   ` H. Peter Anvin
2014-05-14 18:59 ` [PATCH 27/27] xtensa: " Richard Weinberger
2014-05-14 18:59   ` Richard Weinberger
2014-05-15  8:32 ` Consolidate tlb.h Peter Zijlstra
2014-05-15  8:48   ` Richard Weinberger
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-2-git-send-email-richard@nod.at \
    --to=richard@nod.at \
    --cc=arnd@arndb.de \
    --cc=catalin.marinas@arm.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhocko@suse.cz \
    --cc=peterz@infradead.org \
    --cc=steve.capper@linaro.org \
    --cc=will.deacon@arm.com \
    /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).