[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200412.220739.516022706077351913.davem@davemloft.net>
Date: Sun, 12 Apr 2020 22:07:39 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: leon@...nel.org
Cc: bp@...en8.de, kuba@...nel.org, thomas.lendacky@....com,
keyur@...amperecomputing.com, pcnet32@...ntier.com,
vfalico@...il.com, j.vosburgh@...il.com, linux-acenic@...site.dk,
mripard@...nel.org, heiko@...ech.de, mark.einon@...il.com,
chris.snook@...il.com, linux-rockchip@...ts.infradead.org,
iyappan@...amperecomputing.com, irusskikh@...vell.com,
dave@...dillows.org, netanel@...zon.com,
quan@...amperecomputing.com, jcliburn@...il.com,
LinoSanfilippo@....de, linux-arm-kernel@...ts.infradead.org,
andreas@...sler.com, andy@...yhouse.net, netdev@...r.kernel.org,
thor.thayer@...ux.intel.com, linux-kernel@...r.kernel.org,
ionut@...ula.org, akiyano@...zon.com, jes@...ined-monkey.org,
nios2-dev@...ts.rocketboards.org, wens@...e.org
Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition
From: Leon Romanovsky <leon@...nel.org>
Date: Mon, 13 Apr 2020 07:55:55 +0300
> On Sun, Apr 12, 2020 at 09:03:41PM -0700, David Miller wrote:
>> From: Borislav Petkov <bp@...en8.de>
>> Date: Sat, 11 Apr 2020 17:56:23 +0200
>>
>> > From: Borislav Petkov <bp@...e.de>
>> >
>> > 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 <bp@...e.de>
>>
>> I'm so confused, that commit in the Fixes: tag is _removing_ code but adding
>> new #include directives?!?!
>>
>> Is vermagic.h really needed in these files?
>
> You are completely right, it is not needed at all in those files.
Ok let's just remove it to fix this.
Powered by blists - more mailing lists