From: Andrew Morton <akpm@osdl.org>

Cc: Christoph Hellwig <hch@lst.de>
Cc: David S. Peterson <dsp@llnl.gov>
Cc: <dave_peterson@pobox.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/edac/edac_mc.c |    6 +-----
 1 files changed, 1 insertion(+), 5 deletions(-)

diff -puN drivers/edac/edac_mc.c~edac-switch-to-kthread_-api-tidy drivers/edac/edac_mc.c
--- 25/drivers/edac/edac_mc.c~edac-switch-to-kthread_-api-tidy	Wed Mar 15 15:01:40 2006
+++ 25-akpm/drivers/edac/edac_mc.c	Wed Mar 15 15:01:40 2006
@@ -2088,13 +2088,9 @@ static int edac_kernel_thread(void *arg)
 	while (!kthread_should_stop()) {
 		do_edac_check();
 
-		/* ensure we are interruptable */
-		set_current_state(TASK_INTERRUPTIBLE);
-
 		/* goto sleep for the interval */
-		schedule_timeout((HZ * poll_msec) / 1000);
+		schedule_timeout_interruptible((HZ * poll_msec) / 1000);
 		try_to_freeze();
-		__set_current_state(TASK_RUNNING);
 	}
 
 	return 0;
_