diff options
author | Andrew Morton <akpm@osdl.org> | 2006-02-15 18:17:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-15 18:32:21 -0500 |
commit | 651c29a17f7ea0204dacbc2a5042d57b1c9e2e37 (patch) | |
tree | 38f2a6be82ceb75a42f217dd46bc033a613919ec /drivers/ide/ide-taskfile.c | |
parent | 36cbbe5eb9857730768aa5f54ad94d69e0b2133d (diff) |
[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/ide-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 9834dce4e20f..0606bd2f6020 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
35 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
37 | #include <linux/sched.h> | ||
37 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
38 | #include <linux/major.h> | 39 | #include <linux/major.h> |
39 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
@@ -314,6 +315,8 @@ static void ide_pio_datablock(ide_drive_t *drive, struct request *rq, | |||
314 | if (rq->bio) /* fs request */ | 315 | if (rq->bio) /* fs request */ |
315 | rq->errors = 0; | 316 | rq->errors = 0; |
316 | 317 | ||
318 | touch_softlockup_watchdog(); | ||
319 | |||
317 | switch (drive->hwif->data_phase) { | 320 | switch (drive->hwif->data_phase) { |
318 | case TASKFILE_MULTI_IN: | 321 | case TASKFILE_MULTI_IN: |
319 | case TASKFILE_MULTI_OUT: | 322 | case TASKFILE_MULTI_OUT: |