commit 65f5ee0ee7da7067e86903018c58c83aa6965b2b
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 31 19:13:50 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Tue Jul 31 19:13:50 2012 -0700
tree 456c443008e65eb3a923a7318ae3b7a77221fcea
parent b615a63e11674da4044f197d58740c06efa46159
parent 9e6849368b32cacc70fac02e2573db4731bac09b

Merge "spinlock_debug: Print offset in addition to symbol name" into msm-3.4

lib/spinlock_debug.c

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index d0ec4f3..1967297 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -58,7 +58,7 @@
 	printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
 		msg, raw_smp_processor_id(),
 		current->comm, task_pid_nr(current));
-	printk(KERN_EMERG " lock: %ps, .magic: %08x, .owner: %s/%d, "
+	printk(KERN_EMERG " lock: %pS, .magic: %08x, .owner: %s/%d, "
 			".owner_cpu: %d\n",
 		lock, lock->magic,
 		owner ? owner->comm : "<none>",