The patch titled
isdn/sc: compile breakage re check_reset()
has been removed from the -mm tree. Its filename was
isdn-sc-compile-breakage-re-check_reset.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: isdn/sc: compile breakage re check_reset()
From: Alexey Dobriyan <adobriyan@xxxxx>
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@xxxxx>
Cc: Karsten Keil <kkeil@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/isdn/sc/card.h | 2 +-
drivers/isdn/sc/command.c | 2 +-
drivers/isdn/sc/timer.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/isdn/sc/card.h~isdn-sc-compile-breakage-re-check_reset drivers/isdn/sc/card.h
--- a/drivers/isdn/sc/card.h~isdn-sc-compile-breakage-re-check_reset
+++ a/drivers/isdn/sc/card.h
@@ -125,7 +125,7 @@ int sendmessage(int card, unsigned int p
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 */
diff -puN drivers/isdn/sc/command.c~isdn-sc-compile-breakage-re-check_reset drivers/isdn/sc/command.c
--- a/drivers/isdn/sc/command.c~isdn-sc-compile-breakage-re-check_reset
+++ a/drivers/isdn/sc/command.c
@@ -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);
diff -puN drivers/isdn/sc/timer.c~isdn-sc-compile-breakage-re-check_reset drivers/isdn/sc/timer.c
--- a/drivers/isdn/sc/timer.c~isdn-sc-compile-breakage-re-check_reset
+++ a/drivers/isdn/sc/timer.c
@@ -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;
_
Patches currently in -mm which might be from adobriyan@xxxxx are
origin.patch
consolidate-ptrace_detach.patch
git-dvb.patch
use-list_head-in-binfmt-handling.patch
make-unregister_binfmt-return-void.patch
fix-leaks-on-proc-schedsched_debugtimer_listtimer_stats.patch
fix-leak-on-proc-lockdep_stats.patch
slab_panic-more-proc-posix-timers-shmem.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
