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=-4.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 78207C2BA19 for ; Sat, 11 Apr 2020 18:10:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C22F20B1F for ; Sat, 11 Apr 2020 18:10:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586628623; bh=cR0eHiEhVEU/CYCz8ttOIHBrqvYs0p6ey3Uw55qOSGo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=yp04ybm9g1zv36FgI1WwbwhwjFHMGc8BanWlhQB2/b3cGJAYW/2chmOWR3HzcbsaO eQ8j0sZ717A6xg2b3QORl6OiPdAVjf5iFvEREXearP1nwgtXtksjj4f15Yo0x07YAL McsxjrLAIR8AEmS1F8in5xCjJVHUYtBVfgxSSxZQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726773AbgDKSKV (ORCPT ); Sat, 11 Apr 2020 14:10:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:41288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726167AbgDKSKV (ORCPT ); Sat, 11 Apr 2020 14:10:21 -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 E1AE420732; Sat, 11 Apr 2020 18:10:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586628620; bh=cR0eHiEhVEU/CYCz8ttOIHBrqvYs0p6ey3Uw55qOSGo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dcNVzinV8moP+fO5RfqQizJEQ1Fo5MA/EWcPhgl3anCgpKoqChGaQQMh6g6lxD8Zu U4Uz5GI9QK6vrVpGwcn3HSXE+MfBDWSMFeD7yfpw5OsGv/2b1L7VjOahk8qLWPZWwn jvyrMweq0NnBZhQyYqoGjPPwE0zfMs2kGVTNuapw= Date: Sat, 11 Apr 2020 21:10:15 +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: <20200411181015.GC200683@unreal> References: <20200224085311.460338-1-leon@kernel.org> <20200224085311.460338-4-leon@kernel.org> <20200411155623.GA22175@zn.tnic> <20200411161156.GA200683@unreal> <20200411173504.GA11128@zn.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200411173504.GA11128@zn.tnic> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Apr 11, 2020 at 07:35:04PM +0200, Borislav Petkov wrote: > 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? I want to think that it was an outcome of some 0-day kbuild report, but I am not sure about that anymore [1]. Thanks [1] https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org/ > > Thx. > > -- > Regards/Gruss, > Boris. > > https://people.kernel.org/tglx/notes-about-netiquette