From e50940a2d068dfd62c5c191741645bdfcce8dd5a Mon Sep 17 00:00:00 2001
From: Dave C Boutcher <boutcher@cs.umn.edu>
Date: Fri, 3 Feb 2006 01:18:36 -0600
Subject: [PATCH] --- yaml --- r: 20068 b: refs/heads/master c:
 b4fd884a037c791a39f2f03da719e251af176a97 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/rtas.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 030a3ff97212..8724dee2d3e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 82a4df74628a3bf0ac762be198b45e02a7c5879f
+refs/heads/master: b4fd884a037c791a39f2f03da719e251af176a97
diff --git a/trunk/arch/powerpc/kernel/rtas.c b/trunk/arch/powerpc/kernel/rtas.c
index 0c6ed6d75b17..b5b2add7ad1e 100644
--- a/trunk/arch/powerpc/kernel/rtas.c
+++ b/trunk/arch/powerpc/kernel/rtas.c
@@ -599,10 +599,6 @@ static void rtas_percpu_suspend_me(void *info)
 	}
 
 out:
-	/* before we restore interrupts, make sure we don't
-	 * generate a spurious soft lockup errors
-	 */
-	touch_softlockup_watchdog();
 	local_irq_restore(flags);
 	return;
 }