summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-02-15 15:17:37 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-15 15:32:21 -0800
commit651c29a17f7ea0204dacbc2a5042d57b1c9e2e37 (patch)
tree38f2a6be82ceb75a42f217dd46bc033a613919ec /drivers/ide
parent36cbbe5eb9857730768aa5f54ad94d69e0b2133d (diff)
downloadop-kernel-dev-651c29a17f7ea0204dacbc2a5042d57b1c9e2e37.zip
op-kernel-dev-651c29a17f7ea0204dacbc2a5042d57b1c9e2e37.tar.gz
[PATCH] ide: touch softlockup detector during pio
We're getting some softlockup false positives during heavy PIO operations. So poke the lockup detector. Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-taskfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 9834dce..0606bd2 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -34,6 +34,7 @@
#include <linux/kernel.h>
#include <linux/timer.h>
#include <linux/mm.h>
+#include <linux/sched.h>
#include <linux/interrupt.h>
#include <linux/major.h>
#include <linux/errno.h>
@@ -314,6 +315,8 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq,
if (rq->bio) /* fs request */
rq->errors = 0;
+ touch_softlockup_watchdog();
+
switch (drive->hwif->data_phase) {
case TASKFILE_MULTI_IN:
case TASKFILE_MULTI_OUT:
OpenPOWER on IntegriCloud