Skip to contentSkip to conversation

drivers/net/s2io.c section fixes

PATCH In review Adrian Bunk 3 participants 3 messages Dec 11, 2007 – Dec 14, 2007

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 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 <[email protected]>

---

 drivers/net/s2io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

50fb761b99d7ee0b234359d02144f84a87e2faff

drivers/net/s2io.c +2 -2
index 121cb10..9d80f1c 100644
@@ -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;
#1 lore raw

Thanks. Patch looks good. Please accept.

Ram

Quoted 10 lines

-----Original Message-----
From: Adrian Bunk [mailto:[email protected]]
Sent: Tuesday, December 11, 2007 2:23 PM
To: [email protected]; Rastapur Santosh; Sivakumar Subramani; Sreenivasa Honnur; [email protected]
Cc: [email protected]; [email protected]
Subject: [2.6 patch] drivers/net/s2io.c section fixes

Code used by the non-__devinit s2io_open() mustn't be __devinit.

Quoted 7 lines

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')

drivers/net/s2io.c static int s2io_enable_msi_x(struct s2io_nic

Quoted 17 lines

...

<-- snip -->

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/net/s2io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

50fb761b99d7ee0b234359d02144f84a87e2faff

drivers/net/s2io.c +0 -0
index 121cb10..9d80f1c 100644
@@ -3737,7 +3737,7 @@ static int s2io_enable_msi_x(struct s2io_nic

*nic)

drivers/net/s2io.c static irqreturn_t __devinit s2io_test_intr(int

Quoted 9 lines
drivers/net/s2io.c +1 -1
 }
 
 /* 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,

Quoted 9 lines
drivers/net/s2io.c +1 -1
 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;

#2 lore raw
In reply to Adrian Bunk
Quoted 10 lines · Adrian Bunk

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')
...

Quoted 7 lines

<-- snip -->

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/net/s2io.c |    4 ++--

applied #upstream-fixes