Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e3aded3cc289113c7bc729ef4cb75e56d9aa71be

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent 7ac674f527
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 3 changed files with 3 additions and 3 deletions Side-by-side Diff

drivers/isdn/sc/card.h
Diff comments   View file @ e3aded3
... ... @@ -125,7 +125,7 @@
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 */
drivers/isdn/sc/command.c
Diff comments   View file @ e3aded3
... ... @@ -344,7 +344,7 @@
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);
drivers/isdn/sc/timer.c
Diff comments   View file @ e3aded3
... ... @@ -43,7 +43,7 @@
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;