drivers/net/s2io.c section fixes (33390a70) · Commits · 戴 / test

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 <bunk@kernel.org> Signed-off-by:

Jeff Garzik <jeff@garzik.org>

drivers/net/s2io.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message