From mboxrd@z Thu Jan 1 00:00:00 1970 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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 D2058C2BB55 for ; Sat, 11 Apr 2020 16:12:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A80F92083E for ; Sat, 11 Apr 2020 16:12:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586621525; bh=xGSrZYsmr8Rx4rTlJx8S0cahLkNk3/rISN1e36L5dfw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=uwwG6NShU61afINRGrGBqJirutOL8kDPiesWSJdTZcTmn9eVtVwglDX7w9Tc3jOBF g7rGDw0vC+C49M8y0trWBm+BloaI4V/+bHVdAn7dDL8XFGbvb7m/XY7PKitPgZ6cQo 8mSICAJrd3y21h0zAl2ljSigg6LZK550zsyU4nEs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726659AbgDKQMC (ORCPT ); Sat, 11 Apr 2020 12:12:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:58758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726054AbgDKQMC (ORCPT ); Sat, 11 Apr 2020 12:12:02 -0400 Received: from localhost (unknown [213.57.247.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 708232078E; Sat, 11 Apr 2020 16:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586621522; bh=xGSrZYsmr8Rx4rTlJx8S0cahLkNk3/rISN1e36L5dfw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PJuvLC60UfUFZJ6c6uAbd2GfsMnVqppzNcrJkgGE26coDxnU244BVymNHyLFxVvh/ SGVBw4msc7PUOKxizlBOLa+Zn/nyY2mOeFWU/EoNXeoNDBtx/E+f2V7a03X+E0IQLE zchs/QnkHPcr3mObpoAV1v4FVmYW1XFsrDBGjrbw= Date: Sat, 11 Apr 2020 19:11:56 +0300 From: Leon Romanovsky To: Borislav Petkov Cc: "David S. Miller" , Jakub Kicinski , Tom Lendacky , Keyur Chudgar , Don Fry , Veaceslav Falico , Jay Vosburgh , linux-acenic@sunsite.dk, Maxime Ripard , Heiko Stuebner , Mark Einon , Chris Snook , linux-rockchip@lists.infradead.org, Iyappan Subramanian , Igor Russkikh , David Dillow , Netanel Belgazal , Quan Nguyen , Jay Cliburn , Lino Sanfilippo , linux-arm-kernel@lists.infradead.org, Andreas Larsson , Andy Gospodarek , netdev@vger.kernel.org, Thor Thayer , linux-kernel@vger.kernel.org, Ion Badulescu , Arthur Kiyanovski , Jes Sorensen , nios2-dev@lists.rocketboards.org, Chen-Yu Tsai Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Message-ID: <20200411161156.GA200683@unreal> References: <20200224085311.460338-1-leon@kernel.org> <20200224085311.460338-4-leon@kernel.org> <20200411155623.GA22175@zn.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200411155623.GA22175@zn.tnic> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Sat, Apr 11, 2020 at 05:56:23PM +0200, Borislav Petkov wrote: > 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(-) Probably, this is the right change, but I have a feeling that the right solution will be inside headers itself. It is a little bit strange that both very common kernel headers like module.h and vermagic.h are location dependant. Thanks > > 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 > -- > 2.21.0 > > -- > Regards/Gruss, > Boris. > > https://people.kernel.org/tglx/notes-about-netiquette