29 lines
942 B
Diff
29 lines
942 B
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 26 Oct 2014 03:39:42 +0000
|
|
Subject: rtsx_usb_ms: Use msleep_interruptible() in polling loop
|
|
Bug-Debian: https://bugs.debian.org/765717
|
|
|
|
rtsx_usb_ms creates a task that mostly sleeps, but tasks in
|
|
uninterruptible sleep still contribute to the load average (for
|
|
bug-compatibility with Unix). A load average of ~1 on a system that
|
|
should be idle is somewhat alarming.
|
|
|
|
Change the sleep to be interruptible, but still ignore signals.
|
|
|
|
A better fix might be to replace this loop with a delayed work item.
|
|
|
|
diff --git a/drivers/memstick/host/rtsx_usb_ms.c b/drivers/memstick/host/rtsx_usb_ms.c
|
|
index a7282b7..7356780 100644
|
|
--- a/drivers/memstick/host/rtsx_usb_ms.c
|
|
+++ b/drivers/memstick/host/rtsx_usb_ms.c
|
|
@@ -706,7 +706,8 @@ poll_again:
|
|
if (host->eject)
|
|
break;
|
|
|
|
- msleep(1000);
|
|
+ if (msleep_interruptible(1000))
|
|
+ flush_signals(current);
|
|
}
|
|
|
|
complete(&host->detect_ms_exit);
|