tree 70d177ecd0b28480b0099e0b5a81b51f8cdfb7be
parent 0e1dfc66b6ec94984a4778132147a8aa36461d58
author Michal Schmidt <xschmi00@stud.feec.vutbr.cz> 1154253809 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1154377719 -0700

[PATCH] IDE: Touch NMI watchdog during resume from STR

When resuming from suspend-to-RAM, the NMI watchdog detects a lockup in
ide_wait_not_busy.  Here's a screenshot of the trace taken by a digital
camera: http://www.uamt.feec.vutbr.cz/rizeni/pom/DSC03510-2.JPG

Let's touch the NMI watchdog in ide_wait_not_busy.  The system then resumes
correctly from STR.

[akpm@osdl.org: modular build fix]
Signed-off-by: Michal Schmidt <xschmi00@stud.feec.vutbr.cz>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>