From patchwork Wed May 14 18:59:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 348928 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id CC05C140142 for ; Thu, 15 May 2014 05:09:28 +1000 (EST) X-Greylist: delayed 435 seconds by postgrey-1.34 at bilbo; Thu, 15 May 2014 05:08:07 EST Received: from mail.sigma-star.at (mail.sigma-star.at [95.130.255.111]) by ozlabs.org (Postfix) with ESMTP id D2BD41400E0 for ; Thu, 15 May 2014 05:08:07 +1000 (EST) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id 8E82D16B42A2; Wed, 14 May 2014 21:01:01 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.sigma-star.at From: Richard Weinberger To: linux-arch@vger.kernel.org, arnd@arndb.de, linux-kernel@vger.kernel.org Subject: [PATCH 02/27] powerpc: Override defaults from generic/tlb.h Date: Wed, 14 May 2014 20:59:34 +0200 Message-Id: <1400093999-18703-3-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1400093999-18703-1-git-send-email-richard@nod.at> References: <1400093999-18703-1-git-send-email-richard@nod.at> Cc: Richard Weinberger , Paul Mackerras , linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Make sure to not conflict with the defaults provided by generic/tlb.h. Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Richard Weinberger Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Richard Weinberger --- 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 -#include #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