From patchwork Wed May 14 18:59:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 4177291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D38A1BFF02 for ; Wed, 14 May 2014 19:03:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A09F20220 for ; Wed, 14 May 2014 19:03:34 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3D05200D6 for ; Wed, 14 May 2014 19:03:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkeQW-0002bY-UK; Wed, 14 May 2014 19:01:16 +0000 Received: from mail.sigma-star.at ([95.130.255.111]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkeQS-0002Pl-Ct for linux-arm-kernel@lists.infradead.org; Wed, 14 May 2014 19:01:13 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id A9D4B16B42A5; 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 01/27] arm64: Override defaults from generic/tlb.h Date: Wed, 14 May 2014 20:59:33 +0200 Message-Id: <1400093999-18703-2-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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140514_120112_640731_F474C164 X-CRM114-Status: UNSURE ( 7.34 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: Steve Capper , Peter Zijlstra , Richard Weinberger , Will Deacon , Michal Hocko , Catalin Marinas , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Make sure to not conflict with the defaults provided by generic/tlb.h. Cc: Catalin Marinas Cc: Will Deacon Cc: Steve Capper Cc: Peter Zijlstra Cc: Richard Weinberger Cc: Michal Hocko Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Richard Weinberger Acked-by: Catalin Marinas --- 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