| commit | c6eb07c55f9f33501a7ae1d746b45018eecb8468 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Jul 23 20:07:39 2012 -0700 |
| committer | QuIC Gerrit Code Review <code-review@localhost> | Mon Jul 23 20:07:39 2012 -0700 |
| tree | d6b27fe9e35a66e1535a5a034b17412258a9fe95 | |
| parent | e0bfbc2d079483783c2f512060dda16e9678b463 [diff] | |
| parent | a16a8c26fd3dc6566497c606523866dd6165d09a [diff] |
Merge "spinlock_debug: Fix mismerge" into msm-3.4
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index c1906e4..d0ec4f3 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c
@@ -118,10 +118,6 @@ /* lockup suspected: */ if (print_once) { print_once = 0; - printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, " - "%s/%d, %ps\n", - raw_smp_processor_id(), current->comm, - task_pid_nr(current), lock); spin_dump(lock, "lockup"); #ifdef CONFIG_SMP trigger_all_cpu_backtrace();