Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Qian Cai <cai@redhat.com>
To:     Arnd Bergmann <arnd@arndb.de>, Will Deacon <will@kernel.org>
Cc:     Nicholas Piggin <npiggin@gmail.com>,
        Jean-Philippe Brucker <jean-philippe@linaro.org>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH -next] arm64: Fix redefinition of init_new_context()
Date:   Mon, 12 Oct 2020 10:10:32 -0400
Message-Id: <20201012141032.6333-1-cai@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The linux-next commit c870baeede75 ("asm-generic: add generic MMU
versions of mmu context functions") missed a case in the arm64/for-next
branch.

Signed-off-by: Qian Cai <cai@redhat.com>
---
 arch/arm64/include/asm/mmu_context.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
index da5f146e665b..cd5c33a50469 100644
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@ -176,6 +176,7 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp)
  */
 void check_and_switch_context(struct mm_struct *mm);
 
+#define init_new_context init_new_context
 static inline int
 init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
-- 
2.28.0