From: Dave C Boutcher Date: Fri, 3 Feb 2006 07:18:36 +0000 (-0600) Subject: [PATCH] powerpc: remove useless call to touch_softlockup_watchdog X-Git-Tag: v2.6.16-rc3~67^2~12 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4fd884a037c791a39f2f03da719e251af176a97;p=linux-2.6 [PATCH] powerpc: remove useless call to touch_softlockup_watchdog 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 Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 0c6ed6d75b..b5b2add7ad 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/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; }