[PATCH 3/3] powerpc remove useless call to touch_softlockup_watchdog

Dave C Boutcher boutcher at cs.umn.edu
Fri Feb 3 18:18:36 EST 2006


It turns out that we can't stop the watchdog from
triggering here.  If we touch the timer (which just uses the current jiffie
value) before we enable interrupts, it does nothing because jiffies
are not mass-updated until after we enable interrupts.  If we touch the
timer after we enable interrupts, its too late because the softlockup
watchdog will already have triggered.  The touch_softlockup_watchdog
call removed below does nothing.

Signed-off-by: Dave Boutcher <sleddog at us.ibm.com>

---

 arch/powerpc/kernel/rtas.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

14caae1e3b5508ce8798618f9f952f14e7c6d41a
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 4038ac1..1ecfcf8 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -598,10 +598,6 @@ static void rtas_percpu_suspend_me(void 
 	}
 
 out:
-	/* before we restore interrupts, make sure we don't
-	 * generate a spurious soft lockup errors
-	 */
-	touch_softlockup_watchdog();
 	local_irq_restore(flags);
 	return;
 }
-- 
1.1.4.g7310




More information about the Linuxppc64-dev mailing list