diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-20 15:26:04 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-20 15:26:04 -0400 |
| commit | f0b433e9f362e0b7f0ce7d1489dd7feba068605d (patch) | |
| tree | d4bfd9489cf4a96a55d83af20919f477a846d585 /lib/spinlock_debug.c | |
| parent | fa2f5bf09610d3c216d4c74855edbe00d636467c (diff) | |
| parent | 28c42c28309244d0b15d1b385e33429d59997679 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Additional updates for 3.6
A batch more bugfixes, all driver-specific and fairly small and
unremarkable in a global context. The biggest batch are for the newly
added Arizona drivers.
Diffstat (limited to 'lib/spinlock_debug.c')
| -rw-r--r-- | lib/spinlock_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index e91fbc23fff1..eb10578ae055 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) | |||
| 58 | printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", | 58 | printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", |
| 59 | msg, raw_smp_processor_id(), | 59 | msg, raw_smp_processor_id(), |
| 60 | current->comm, task_pid_nr(current)); | 60 | current->comm, task_pid_nr(current)); |
| 61 | printk(KERN_EMERG " lock: %ps, .magic: %08x, .owner: %s/%d, " | 61 | printk(KERN_EMERG " lock: %pS, .magic: %08x, .owner: %s/%d, " |
| 62 | ".owner_cpu: %d\n", | 62 | ".owner_cpu: %d\n", |
| 63 | lock, lock->magic, | 63 | lock, lock->magic, |
| 64 | owner ? owner->comm : "<none>", | 64 | owner ? owner->comm : "<none>", |