From patchwork Sat Apr 11 15:56:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 11484141 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C49C192C for ; Sat, 11 Apr 2020 15:56:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 99A9620757 for ; Sat, 11 Apr 2020 15:56:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nG4gngcT"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=alien8.de header.i=@alien8.de header.b="olq7daV2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 99A9620757 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=alien8.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BaaVVwbJYN22tAYOLXsIW1wRwkyfLZbuxrw++dVoK04=; b=nG4gngcT9c2AmQ Gef6MS1No7K9WQS9yJiEJ1CK90GuXX23cwOuEXeJuU7Ps5CIcftCS6RQd4Pfuw6lZ2H3k6aw3U2Fq nmHFasGwBRllIiaRJEUMiuGQ/oYSgHEMaop5tqcHRIl8s9DR8NhWxwKuez+1DRJwIX9uBWIeMV/fK jB2NVyiFTnaab/pjxsBtdO2ARN6/K7rX005IlHuXZqfXqSzOXXdlLX8r9j9yPT/LA5Unk7KHPRyFC s7QlSo/pfyYI5BBgTCnJs2CnGjWfOk38BkCvV9dV9Nh/BPtqS2nQ+qD04zsapWNTMYq9tNH1Edx2E XazRBQ17sark2lyuhyVg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jNIUs-00016g-7h; Sat, 11 Apr 2020 15:56:42 +0000 Received: from mail.skyhub.de ([2a01:4f8:190:11c2::b:1457]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jNIUo-00015U-HK; Sat, 11 Apr 2020 15:56:40 +0000 Received: from zn.tnic (p200300EC2F1EE2004DDA4FC6A7F1C076.dip0.t-ipconnect.de [IPv6:2003:ec:2f1e:e200:4dda:4fc6:a7f1:c076]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 404AB1EC085F; Sat, 11 Apr 2020 17:56:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1586620589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=0QgKfyD3UcjRgzIwSEmTFwH1FvRCThOAFzQ5S67+qsI=; b=olq7daV2ItKU/slSpda7p8nzWckB9HYez1JCJ44uiLmdHYcn/3sb1KyxX0N4bSYLkeByEc tJIDbMt8m1/bjY7Pw0bZ4MMIIVKiNkPj1a+NKhcxS+2lDfEnuIHXkBiWRUKxiT0XVVWQPq DrnfQ0kcqIextkY2FMCiztRhZDUYQUs= Date: Sat, 11 Apr 2020 17:56:23 +0200 From: Borislav Petkov To: Leon Romanovsky , "David S. Miller" , Jakub Kicinski Subject: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Message-ID: <20200411155623.GA22175@zn.tnic> References: <20200224085311.460338-1-leon@kernel.org> <20200224085311.460338-4-leon@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200224085311.460338-4-leon@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200411_085638_882188_AA28DDAC X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Thor Thayer , Heiko Stuebner , Igor Russkikh , Andreas Larsson , Chris Snook , David Dillow , Jes Sorensen , Iyappan Subramanian , Quan Nguyen , linux-acenic@sunsite.dk, Andy Gospodarek , Arthur Kiyanovski , linux-rockchip@lists.infradead.org, Chen-Yu Tsai , Lino Sanfilippo , Veaceslav Falico , Tom Lendacky , Jay Cliburn , Jay Vosburgh , Keyur Chudgar , Maxime Ripard , Leon Romanovsky , Don Fry , nios2-dev@lists.rocketboards.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ion Badulescu , Netanel Belgazal , Mark Einon Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Borislav Petkov Change the include order so that MODULE_ARCH_VERMAGIC from the arch header arch/x86/include/asm/module.h gets used instead of the fallback from include/linux/vermagic.h and thus fix: In file included from ./include/linux/module.h:30, from drivers/net/ethernet/3com/3c515.c:56: ./arch/x86/include/asm/module.h:73: warning: "MODULE_ARCH_VERMAGIC" redefined 73 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY | In file included from drivers/net/ethernet/3com/3c515.c:25: ./include/linux/vermagic.h:28: note: this is the location of the previous definition 28 | #define MODULE_ARCH_VERMAGIC "" | Fixes: 6bba2e89a88c ("net/3com: Delete driver and module versions from 3com drivers") Signed-off-by: Borislav Petkov --- drivers/net/ethernet/3com/3c515.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index 90312fcd6319..cdceef891dbd 100644 --- a/drivers/net/ethernet/3com/3c515.c +++ b/drivers/net/ethernet/3com/3c515.c @@ -22,7 +22,6 @@ */ -#include #define DRV_NAME "3c515" #define CORKSCREW 1 @@ -67,6 +66,7 @@ static int max_interrupt_work = 20; #include #include #include +#include #include #include