Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757792AbXLKXRs (ORCPT ); Tue, 11 Dec 2007 18:17:48 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756227AbXLKXR3 (ORCPT ); Tue, 11 Dec 2007 18:17:29 -0500 Received: from mx.neterion.com ([72.1.205.142]:59528 "EHLO owa.neterion.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755827AbXLKXR1 convert rfc822-to-8bit (ORCPT ); Tue, 11 Dec 2007 18:17:27 -0500 X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 8BIT Subject: RE: [2.6 patch] drivers/net/s2io.c section fixes Date: Tue, 11 Dec 2007 18:16:51 -0500 Message-ID: <78C9135A3D2ECE4B8162EBDCE82CAD7702B13B2D@nekter> In-Reply-To: <20071211222306.GV14204@stusta.de> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [2.6 patch] drivers/net/s2io.c section fixes Thread-Index: Acg8RIvMet7eU0jmQuywV7RKQGtahQABy+Cw From: "Ramkrishna Vepa" To: "Adrian Bunk" , Cc: , , "Rastapur Santosh" , "Sivakumar Subramani" , "Sreenivasa Honnur" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1987 Lines: 64 Thanks. Patch looks good. Please accept. Ram > -----Original Message----- > From: Adrian Bunk [mailto:bunk@kernel.org] > Sent: Tuesday, December 11, 2007 2:23 PM > To: ram.vepa@neterion.com; Rastapur Santosh; Sivakumar Subramani; > Sreenivasa Honnur; jgarzik@pobox.com > Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: [2.6 patch] drivers/net/s2io.c section fixes > > Code used by the non-__devinit s2io_open() mustn't be __devinit. > > This patch fixes the following section mismatch with CONFIG_HOTPLUG=n: > > <-- snip --> > > ... > WARNING: vmlinux.o(.text+0x6f6e3e): Section mismatch: reference to > .init.text.20:s2io_test_intr (between 's2io_open' and 's2io_ethtool_sset') > ... > > <-- snip --> > > Signed-off-by: Adrian Bunk > > --- > > drivers/net/s2io.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 50fb761b99d7ee0b234359d02144f84a87e2faff > diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c > index 121cb10..9d80f1c 100644 > --- a/drivers/net/s2io.c > +++ b/drivers/net/s2io.c > @@ -3737,7 +3737,7 @@ static int s2io_enable_msi_x(struct s2io_nic *nic) > } > > /* Handle software interrupt used during MSI(X) test */ > -static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id) > +static irqreturn_t s2io_test_intr(int irq, void *dev_id) > { > struct s2io_nic *sp = dev_id; > > @@ -3748,7 +3748,7 @@ static irqreturn_t __devinit s2io_test_intr(int irq, > void *dev_id) > } > > /* Test interrupt path by forcing a a software IRQ */ > -static int __devinit s2io_test_msi(struct s2io_nic *sp) > +static int s2io_test_msi(struct s2io_nic *sp) > { > struct pci_dev *pdev = sp->pdev; > struct XENA_dev_config __iomem *bar0 = sp->bar0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/