From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: [PATCH] net/3com/3c515: Fix MODULE_ARCH_VERMAGIC redefinition Date: Sat, 11 Apr 2020 19:35:04 +0200 Message-ID: <20200411173504.GA11128@zn.tnic> References: <20200224085311.460338-1-leon@kernel.org> <20200224085311.460338-4-leon@kernel.org> <20200411155623.GA22175@zn.tnic> <20200411161156.GA200683@unreal> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20200411161156.GA200683@unreal> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane-mx.org@lists.infradead.org To: Leon Romanovsky 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 , Jakub Kicinski , Tom Lendacky , Jay Cliburn , Jay Vosburgh , Keyur Chudgar , Maxime Ripard , Don Fry , nios2-dev@li List-Id: linux-rockchip.vger.kernel.org On Sat, Apr 11, 2020 at 07:11:56PM +0300, Leon Romanovsky wrote: > 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. Judging by how only a couple of net drivers include vermagic.h directly, doh, of course: diff --git a/drivers/net/ethernet/3com/3c509.c b/drivers/net/ethernet/3com/3c509.c index b762176a1406..139d0120f511 100644 --- a/drivers/net/ethernet/3com/3c509.c +++ b/drivers/net/ethernet/3com/3c509.c @@ -85,7 +85,6 @@ #include #include #include -#include #include #include diff --git a/drivers/net/ethernet/3com/3c515.c b/drivers/net/ethernet/3com/3c515.c index 90312fcd6319..47b4215bb93b 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 --- Drivers include #include which includes #include which defines the arch-specific MODULE_ARCH_VERMAGIC. Why did you need to include vermagic.h directly? i386 builds fine with the vermagic.h includes removed or was it some other arches which needed it? Thx. -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette