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

[SCSI] aha152x: fix debug mode symbol conflict

The symbol <debug_locks> conflicts with the rather global one in
include/linux/locks.h.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

authored by

Boaz Harrosh and committed by
James Bottomley 50535df3 03a5743a

+6 -6
+5 -5
drivers/scsi/aha152x.c
··· 289 289 if(spin_is_locked(&QLOCK)) { \ 290 290 DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ 291 291 } \ 292 - DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 292 + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 293 293 spin_lock_irqsave(&QLOCK,flags); \ 294 - DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 294 + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 295 295 QLOCKER=__FUNCTION__; \ 296 296 QLOCKERL=__LINE__; \ 297 297 } while(0) 298 298 299 299 #define DO_UNLOCK(flags) \ 300 300 do { \ 301 - DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ 301 + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \ 302 302 spin_unlock_irqrestore(&QLOCK,flags); \ 303 - DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 303 + DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \ 304 304 QLOCKER="(not locked)"; \ 305 305 QLOCKERL=0; \ 306 306 } while(0) ··· 3395 3395 PDEBUG(debug_datai, "data in"); 3396 3396 PDEBUG(debug_datao, "data out"); 3397 3397 PDEBUG(debug_eh, "eh"); 3398 - PDEBUG(debug_locks, "locks"); 3398 + PDEBUG(debug_locking, "locks"); 3399 3399 PDEBUG(debug_phases, "phases"); 3400 3400 3401 3401 SPRINTF("\n");
+1 -1
drivers/scsi/aha152x.h
··· 298 298 enum { 299 299 debug_procinfo = 0x0001, 300 300 debug_queue = 0x0002, 301 - debug_locks = 0x0004, 301 + debug_locking = 0x0004, 302 302 debug_intr = 0x0008, 303 303 debug_selection = 0x0010, 304 304 debug_msgo = 0x0020,