isdn/sc: compile breakage re check_reset() (e3aded3c) · Commits · 戴 / test

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>

drivers/isdn/sc/card.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int procid, unsigned int type,
		int receivemessage(int card, RspMessage *rspmsg);
		int sc_ioctl(int card, scs_ioctl *data);
		int setup_buffers(int card, int c);
		void check_reset(unsigned long data);
		void sc_check_reset(unsigned long data);
		void check_phystat(unsigned long data);

		#endif /* CARD_H */

drivers/isdn/sc/command.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ int reset(int card)

		spin_lock_irqsave(&sc_adapter[card]->lock, flags);
		init_timer(&sc_adapter[card]->reset_timer);
		sc_adapter[card]->reset_timer.function = check_reset;
		sc_adapter[card]->reset_timer.function = sc_check_reset;
		sc_adapter[card]->reset_timer.data = card;
		sc_adapter[card]->reset_timer.expires = jiffies + CHECKRESET_TIME;
		add_timer(&sc_adapter[card]->reset_timer);

drivers/isdn/sc/timer.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ static void setup_ports(int card)
		* Then, check to see if the signate has been set. Next, set the
		* signature to a known value and issue a startproc if needed.
		*/
		void check_reset(unsigned long data)
		void sc_check_reset(unsigned long data)
		{
		unsigned long flags;
		unsigned long sig;

Admin message