Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

isdn/sc: compile breakage re check_reset()

There is check_reset() -- global function in drivers/isdn/sc/
There is check_reset -- variable holding module param in aacraid driver.

On allyesconfig they clash with:

LD drivers/built-in.o
drivers/isdn/built-in.o: In function `check_reset':
: multiple definition of `check_reset'
drivers/scsi/built-in.o:(.data+0xe458): first defined here
ld: Warning: size of symbol `check_reset' changed from 4 in drivers/scsi/built-in.o to 219 in drivers/isdn/built-in.o
ld: Warning: type of symbol `check_reset' changed from 1 to 2 in drivers/isdn/built-in.o

Rename the former.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alexey Dobriyan and committed by
Linus Torvalds
e3aded3c 7ac674f5

+3 -3
+1 -1
drivers/isdn/sc/card.h
··· 125 125 int receivemessage(int card, RspMessage *rspmsg); 126 126 int sc_ioctl(int card, scs_ioctl *data); 127 127 int setup_buffers(int card, int c); 128 - void check_reset(unsigned long data); 128 + void sc_check_reset(unsigned long data); 129 129 void check_phystat(unsigned long data); 130 130 131 131 #endif /* CARD_H */
+1 -1
drivers/isdn/sc/command.c
··· 344 344 345 345 spin_lock_irqsave(&sc_adapter[card]->lock, flags); 346 346 init_timer(&sc_adapter[card]->reset_timer); 347 - sc_adapter[card]->reset_timer.function = check_reset; 347 + sc_adapter[card]->reset_timer.function = sc_check_reset; 348 348 sc_adapter[card]->reset_timer.data = card; 349 349 sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME; 350 350 add_timer(&sc_adapter[card]->reset_timer);
+1 -1
drivers/isdn/sc/timer.c
··· 43 43 * Then, check to see if the signate has been set. Next, set the 44 44 * signature to a known value and issue a startproc if needed. 45 45 */ 46 - void check_reset(unsigned long data) 46 + void sc_check_reset(unsigned long data) 47 47 { 48 48 unsigned long flags; 49 49 unsigned long sig;