From a16a8c26fd3dc6566497c606523866dd6165d09a Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Fri, 20 Jul 2012 18:13:08 -0700
Subject: [PATCH] spinlock_debug: Fix mismerge

This file was mismerged in the 3.4 kernel upgrade. We shouldn't
print the lockup twice.

Change-Id: If09a07d8b6c570632e1abac0a23c3ed203cd3ced
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
 lib/spinlock_debug.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index c1906e41247..d0ec4f3d159 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -118,10 +118,6 @@ static void __spin_lock_debug(raw_spinlock_t *lock)
 		/* 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();