From patchwork Wed Oct 28 01:56:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 11862347 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2968C388F9 for ; Wed, 28 Oct 2020 01:57:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22839207DE for ; Wed, 28 Oct 2020 01:57:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="0ooZSpso" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 22839207DE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=2fd43bXO//6cq3M9iULigny5ddsnYNvPUZf2Yx/Kse8=; b=0ooZSpsovd3TmQ7GabibIie4wz pjwz6y1SurCUYrGla2LFEczW/B2O66L13Z3G+vx+i/ijoHlYb3Tfi3AFYm+3fzeycx+qPjPzkTKGl JTTCGLsdOmq/vuyf0cXC4D2/v6CUoMVsi/nLuobrv2FrD8XVyxx2SLjbdLUhVPagBoljqhAWijMew 5Jx+ivDe2cMjt3miuzhAglW3Hp6vbaffYOb0nBw9/K5GQBeW95LU5u9GsjSEhoc7m1SLWT+PxN/C0 5nNFuv2Vz792TRY5nn+FHTuJcVEFOCroHrsBkYGd6VVsYaeo2MGg/4X24paDIadCi/GWU5JJp3fnQ ErGlO/cg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXahD-0005O9-Gu; Wed, 28 Oct 2020 01:56:15 +0000 Received: from mx.socionext.com ([202.248.49.38]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXahA-0005Nn-Qw for linux-arm-kernel@lists.infradead.org; Wed, 28 Oct 2020 01:56:13 +0000 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 28 Oct 2020 10:56:11 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id AE547180C13; Wed, 28 Oct 2020 10:56:11 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Wed, 28 Oct 2020 10:56:11 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 337081A15B7; Wed, 28 Oct 2020 10:56:11 +0900 (JST) From: Kunihiko Hayashi To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: Fix build error for init_new_context() Date: Wed, 28 Oct 2020 10:56:07 +0900 Message-Id: <1603850167-22652-1-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_215613_069364_79C47CA4 X-CRM114-Status: GOOD ( 15.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kunihiko Hayashi , Nicholas Piggin , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org After init_new_context() in arch/arm64/include/asm/mmu_context.h changed to inline, asm-generic/mmu_context.h inclusion was added. This should be defined. Fixes these build error: ../include/asm-generic/mmu_context.h:34:19: error: redefinition of 'init_new_context' 34 | static inline int init_new_context(struct task_struct *tsk, | ^~~~~~~~~~~~~~~~ Cc: Nicholas Piggin Fixes: 4c792ad103f3 ("arm64: use asm-generic/mmu_context.h for no-op implementations") Signed-off-by: Kunihiko Hayashi --- 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 da5f146..cd5c33a 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) {