diff options
author | Dave C Boutcher <boutcher@cs.umn.edu> | 2006-02-03 02:18:36 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-02-07 05:32:44 -0500 |
commit | b4fd884a037c791a39f2f03da719e251af176a97 (patch) | |
tree | 46762b131dd357f04b474acc30a5ea9b2b9499b3 /arch/powerpc | |
parent | 82a4df74628a3bf0ac762be198b45e02a7c5879f (diff) |
[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 <sleddog@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 0c6ed6d75b17..b5b2add7ad1e 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) | |||
599 | } | 599 | } |
600 | 600 | ||
601 | out: | 601 | out: |
602 | /* before we restore interrupts, make sure we don't | ||
603 | * generate a spurious soft lockup errors | ||
604 | */ | ||
605 | touch_softlockup_watchdog(); | ||
606 | local_irq_restore(flags); | 602 | local_irq_restore(flags); |
607 | return; | 603 | return; |
608 | } | 604 | } |