From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751827AbaENTK5 (ORCPT ); Wed, 14 May 2014 15:10:57 -0400 Received: from mail.sigma-star.at ([95.130.255.111]:62411 "EHLO mail.sigma-star.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750810AbaENTAs (ORCPT ); Wed, 14 May 2014 15:00:48 -0400 From: Richard Weinberger To: linux-arch@vger.kernel.org, arnd@arndb.de, linux-kernel@vger.kernel.org Cc: Richard Weinberger , Catalin Marinas , Will Deacon , Steve Capper , Peter Zijlstra , Michal Hocko , 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 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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 -- 1.8.4.2