Re: [2.6 patch] input/serio/hp_sdc.c section fix

Previous thread: [2.6 patch] drivers/bluetooth/bpa10x.c: fix memleak by Adrian Bunk on Wednesday, October 24, 2007 - 9:26 am. (2 messages)

Next thread: [2.6 patch] drivers/bluetooth/btsdio.c: fix double-free by Adrian Bunk on Wednesday, October 24, 2007 - 9:26 am. (2 messages)
From: Adrian Bunk
Date: Wednesday, October 24, 2007 - 9:26 am

hp_sdc_exit() mustn't be __exit since it's called from the
__init hp_sdc_register().

This patch fixes the following section mismatch:

<--  snip  -->

...
  MODPOST vmlinux.o
...
WARNING: vmlinux.o(.init.text+0x1af68): Section mismatch: reference to .exit.text:hp_sdc_exit (between 'hp_sdc_register' and 'hp_sdc_mlc_init')
...

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
4022ed345d1b61dc5b6ac0fc35877656e444a11d 
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 6af1998..02b3ad8 100644
--- a/drivers/input/serio/hp_sdc.c
+++ b/drivers/input/serio/hp_sdc.c
@@ -944,11 +944,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
 
 #endif /* __hppa__ */
 
-#if !defined(__mc68000__) /* Link error on m68k! */
-static void __exit hp_sdc_exit(void)
-#else
 static void hp_sdc_exit(void)
-#endif
 {
 	write_lock_irq(&hp_sdc.lock);
 

-

From: Dmitry Torokhov
Date: Saturday, October 27, 2007 - 10:03 pm

Applied, thank you Adrian.

-- 
Dmitry
-

Previous thread: [2.6 patch] drivers/bluetooth/bpa10x.c: fix memleak by Adrian Bunk on Wednesday, October 24, 2007 - 9:26 am. (2 messages)

Next thread: [2.6 patch] drivers/bluetooth/btsdio.c: fix double-free by Adrian Bunk on Wednesday, October 24, 2007 - 9:26 am. (2 messages)