From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 46C9C2BAE for ; Mon, 21 Nov 2016 07:07:06 +0100 (CET) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP; 20 Nov 2016 22:07:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,525,1473145200"; d="scan'208";a="33850956" Received: from yliu-dev.sh.intel.com (HELO yliu-dev) ([10.239.67.162]) by fmsmga005.fm.intel.com with ESMTP; 20 Nov 2016 22:07:05 -0800 Date: Mon, 21 Nov 2016 14:07:53 +0800 From: Yuanhan Liu To: Ferruh Yigit Cc: stable@dpdk.org Message-ID: <20161121060753.GP5048@yliu-dev.sh.intel.com> References: <20161115135814.GC5048@yliu-dev.sh.intel.com> <20161118122326.24442-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161118122326.24442-1-ferruh.yigit@intel.com> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [dpdk-stable] [PATCH 1/2] kni: fix build with kernel 4.8 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Nov 2016 06:07:07 -0000 On Fri, Nov 18, 2016 at 12:23:25PM +0000, Ferruh Yigit wrote: > [ backported from upstream commit 7f5565592c5ab2f3541951d2b4e65188d01d5d00 ] > > Linux kernel v4.8 removes macro DEFINE_PCI_DEVICE_TABLE > > Linux: 7e9321599011 ("treewide: remove references to the now unnecessary > DEFINE_PCI_DEVICE_TABLE") > > Replaced macro with its value in kni ethtool drivers. Series applied to dpdk stable branch 16.07. Thanks. --yliu > Signed-off-by: Ferruh Yigit > Acked-by: Pablo de Lara > Acked-by: Christian Ehrhardt > Acked-by: Stephen Hemminger > --- > lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 2 +- > lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c > index 96acec5..efd39c6 100644 > --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c > +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c > @@ -76,7 +76,7 @@ static const char igb_driver_string[] = > static const char igb_copyright[] = > "Copyright (c) 2007-2013 Intel Corporation."; > > -static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { > +const struct pci_device_id igb_pci_tbl[] = { > { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_1GBPS) }, > { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_SGMII) }, > { PCI_VDEVICE(INTEL, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS) }, > diff --git a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c > index 92fc9fc..238028d 100644 > --- a/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c > +++ b/lib/librte_eal/linuxapp/kni/ethtool/ixgbe/ixgbe_main.c > @@ -86,7 +86,7 @@ const char ixgbe_driver_version[] = DRV_VERSION; > * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, > * Class, Class Mask, private data (not used) } > */ > -DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { > +const struct pci_device_id ixgbe_pci_tbl[] = { > {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598)}, > {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT)}, > {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT)}, > -- > 2.9.3