diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
| commit | 9e9fd65d1fa51d919d54d731be0e66492b5b6c5a (patch) | |
| tree | a1c7bd35ccff62ff2e678514d3599110f18f113a /lib/spinlock_debug.c | |
| parent | spi/gpio: start with CS non-active (diff) | |
| parent | spi/pl022: cleanup pl022 header documentation (diff) | |
| download | linux-dev-9e9fd65d1fa51d919d54d731be0e66492b5b6c5a.tar.xz linux-dev-9e9fd65d1fa51d919d54d731be0e66492b5b6c5a.zip | |
Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into spi-next
Diffstat (limited to 'lib/spinlock_debug.c')
| -rw-r--r-- | lib/spinlock_debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index 525d160d44f0..e91fbc23fff1 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c @@ -58,7 +58,7 @@ static void spin_dump(raw_spinlock_t *lock, const char *msg) 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: %p, .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>", @@ -118,7 +118,7 @@ static void __spin_lock_debug(raw_spinlock_t *lock) /* lockup suspected: */ if (print_once) { print_once = 0; - spin_dump(lock, "lockup"); + spin_dump(lock, "lockup suspected"); #ifdef CONFIG_SMP trigger_all_cpu_backtrace(); #endif |