Commit 51989b9f authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds
Browse files

[PATCH] printk levels for spinlock debug 



Signed-off-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0ad42352

lib/spinlock_debug.c

+11 −7
Original line number Diff line number Diff line
@@ -19,10 +19,11 @@ static void spin_bug(spinlock_t *lock, const char *msg) 
	if (xchg(&print_once, 0)) {

		if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)

			owner = lock->owner;

		printk("BUG: spinlock %s on CPU#%d, %s/%d\n",

		printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",

			msg, raw_smp_processor_id(),

			current->comm, current->pid);

		printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",

		printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "

				".owner_cpu: %d\n",

			lock, lock->magic,

			owner ? owner->comm : "<none>",

			owner ? owner->pid : -1,
@@ -78,7 +79,8 @@ static void __spin_lock_debug(spinlock_t *lock) 
		/* lockup suspected: */

		if (print_once) {

			print_once = 0;

			printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",

			printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "

					"%s/%d, %p\n",

				raw_smp_processor_id(), current->comm,

				current->pid, lock);

			dump_stack();
@@ -120,8 +122,8 @@ static void rwlock_bug(rwlock_t *lock, const char *msg) 
	static long print_once = 1;



	if (xchg(&print_once, 0)) {

		printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,

			raw_smp_processor_id(), current->comm,

		printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",

			msg, raw_smp_processor_id(), current->comm,

			current->pid, lock);

		dump_stack();

#ifdef CONFIG_SMP
@@ -149,7 +151,8 @@ static void __read_lock_debug(rwlock_t *lock) 
		/* lockup suspected: */

		if (print_once) {

			print_once = 0;

			printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",

			printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, "

					"%s/%d, %p\n",

				raw_smp_processor_id(), current->comm,

				current->pid, lock);

			dump_stack();
@@ -221,7 +224,8 @@ static void __write_lock_debug(rwlock_t *lock) 
		/* lockup suspected: */

		if (print_once) {

			print_once = 0;

			printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",

			printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, "

					"%s/%d, %p\n",

				raw_smp_processor_id(), current->comm,

				current->pid, lock);

			dump_stack();