Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50535df3 authored by Boaz Harrosh's avatar Boaz Harrosh Committed by James Bottomley
Browse files

[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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarBoaz Harrosh <bharrosh@panasas.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 03a5743a

drivers/scsi/aha152x.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -289,18 +289,18 @@ static LIST_HEAD(aha152x_host_list); 
		if(spin_is_locked(&QLOCK)) { \

		if(spin_is_locked(&QLOCK)) { \

			DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \

			DPRINTK(debug_intr, DEBUG_LEAD "(%s:%d) already locked at %s:%d\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \

		} \

		} \

		DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locking\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		spin_lock_irqsave(&QLOCK,flags); \

		spin_lock_irqsave(&QLOCK,flags); \

		DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) locked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		QLOCKER=__FUNCTION__; \

		QLOCKER=__FUNCTION__; \

		QLOCKERL=__LINE__; \

		QLOCKERL=__LINE__; \

	} while(0)

	} while(0)





#define DO_UNLOCK(flags)	\

#define DO_UNLOCK(flags)	\

	do { \

	do { \

		DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \

		DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocking (locked at %s:%d)\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__, QLOCKER, QLOCKERL); \

		spin_unlock_irqrestore(&QLOCK,flags); \

		spin_unlock_irqrestore(&QLOCK,flags); \

		DPRINTK(debug_locks, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		DPRINTK(debug_locking, DEBUG_LEAD "(%s:%d) unlocked\n", CMDINFO(CURRENT_SC), __FUNCTION__, __LINE__); \

		QLOCKER="(not locked)"; \

		QLOCKER="(not locked)"; \

		QLOCKERL=0; \

		QLOCKERL=0; \

	} while(0)

	} while(0)
@@ -3395,7 +3395,7 @@ static int aha152x_proc_info(struct Scsi_Host *shpnt, char *buffer, char **start 
	PDEBUG(debug_datai, "data in");

	PDEBUG(debug_datai, "data in");

	PDEBUG(debug_datao, "data out");

	PDEBUG(debug_datao, "data out");

	PDEBUG(debug_eh, "eh");

	PDEBUG(debug_eh, "eh");

	PDEBUG(debug_locks, "locks");

	PDEBUG(debug_locking, "locks");

	PDEBUG(debug_phases, "phases");

	PDEBUG(debug_phases, "phases");





	SPRINTF("\n");

	SPRINTF("\n");

drivers/scsi/aha152x.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -298,7 +298,7 @@ typedef union { 
enum {

enum {

  debug_procinfo  = 0x0001,

  debug_procinfo  = 0x0001,

  debug_queue     = 0x0002,

  debug_queue     = 0x0002,

  debug_locks     = 0x0004,

  debug_locking   = 0x0004,

  debug_intr      = 0x0008,

  debug_intr      = 0x0008,

  debug_selection = 0x0010,

  debug_selection = 0x0010,

  debug_msgo      = 0x0020,

  debug_msgo      = 0x0020,