Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1057899pxx; Tue, 27 Oct 2020 07:19:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/dajXmu89nZ1h6YleaaFtC+Xe+0jTQCmNXfO234KK/DJaYAwfWcivBcTvNFZ6OhTuK0vl X-Received: by 2002:a17:907:43c6:: with SMTP id i6mr2574592ejs.207.1603808388437; Tue, 27 Oct 2020 07:19:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603808388; cv=none; d=google.com; s=arc-20160816; b=B0lOSaBp948tLswVme9MqDABmfPdYY3FfMfRh9UQSAdrzGoZbujGGm+pDUa+GdhLjt oFv6YpE5KUSO7qxfFgIJ52CKJkN7QEvrOWQ7hn9jWCafc2+2JAyFLrnYPbxgXE6/tx6P +FJtX1qvPiMNHr6IAIRZ8okprKpqPh98P1B4kY9A3lrMxH8YYqDZML+mjsWj2FAMFb73 xeKS9t6mgtMknl+1h6iVTgQFgCAFNwJtUyOIGK8FAlCsD3o/WUyb56iXCFa2wVXryGxv aNIzAE24YEGZU4/Xr5dOhoO6LCXY0cDUZTRbjsc6G+zKQJmnCUhspm08/VsvuN3t/rGc Kq2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=NUSElYPTQUhWZFJwT/hsvalM8n/ktaMubDG/Plseue8=; b=bAKPIUFHtOEQ56zrsNlBNtzLy3XJ6W7Z5e23HHOORli2nWMlVEfwmk2heJ2qm8NnKV AdzIe1g+ngqg9wfLmWYGBPDXEWJiOWIC8NUfnMjNdxDCCorm4pt6Vsb2/vNPSilL530a NSaAh5LM+a9falNLpmEjbFfg8Z2KvABGfPVzS9y3x6u3VsxAf+CQcXXfvVbOATzS0obx ozGv0FaFf7Ujp6v62T5iCd1Qlvd2vOPcb4o/T0y+Z0e6FM34eGwOPNYc/uWdKLCTDZfo LSawPOXJfmipyf5eZAx2dWJRhYsYwlaqg0a9drJHgKbJXoc6gcherk1uCnw88Nntb5Vx W9dA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z8si1067092eju.267.2020.10.27.07.19.25; Tue, 27 Oct 2020 07:19:48 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2894551AbgJ0IT2 (ORCPT + 99 others); Tue, 27 Oct 2020 04:19:28 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:35634 "EHLO leibniz.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2894546AbgJ0IT1 (ORCPT ); Tue, 27 Oct 2020 04:19:27 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4CL4P904skzMqfXj for ; Tue, 27 Oct 2020 09:19:25 +0100 (CET) Received: from ramsan.of.borg ([84.195.186.194]) by baptiste.telenet-ops.be with bizsmtp id kwKP2300X4C55Sk01wKPk0; Tue, 27 Oct 2020 09:19:24 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kXKCR-000WG8-8w; Tue, 27 Oct 2020 09:19:23 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1kXKCQ-00GpRT-Nb; Tue, 27 Oct 2020 09:19:22 +0100 From: Geert Uytterhoeven To: Nicholas Piggin , Arnd Bergmann Cc: linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , noreply@ellerman.id.au Subject: [PATCH -next] m68k: mmu_context: Fix Sun-3 build Date: Tue, 27 Oct 2020 09:19:19 +0100 Message-Id: <20201027081919.4010948-1-geert+renesas@glider.be> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building for Sun-3 (e.g. sun3_defconfig): In file included from ./arch/m68k/include/asm/mmu_context.h:312, from arch/m68k/sun3/mmu_emu.c:28: ./include/asm-generic/mmu_context.h:46:20: error: redefinition of ‘destroy_context’ 46 | static inline void destroy_context(struct mm_struct *mm) | ^~~~~~~~~~~~~~~ In file included from arch/m68k/sun3/mmu_emu.c:28: ./arch/m68k/include/asm/mmu_context.h:192:20: note: previous definition of ‘destroy_context’ was here 192 | static inline void destroy_context(struct mm_struct *mm) | ^~~~~~~~~~~~~~~ Fix this by marking destroy_context implemented by arch-specific code. Reported-by: noreply@ellerman.id.au Fixes: cb41155766b05935 ("m68k: use asm-generic/mmu_context.h for no-op implementations") Signed-off-by: Geert Uytterhoeven --- arch/m68k/include/asm/mmu_context.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h index d12d8a9032f67bdd..a5d358855878490f 100644 --- a/arch/m68k/include/asm/mmu_context.h +++ b/arch/m68k/include/asm/mmu_context.h @@ -189,6 +189,7 @@ static inline void get_mmu_context(struct mm_struct *mm) } /* flush context if allocated... */ +#define destroy_context destroy_context static inline void destroy_context(struct mm_struct *mm) { if (mm->context != SUN3_INVALID_CONTEXT) -- 2.25.1