diff options
| author | Martin Wilck <martin.wilck@ts.fujitsu.com> | 2010-06-29 15:05:31 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:29:45 -0700 |
| commit | 0dd6ec3a33cab9ee890c9ff671edea9202246c27 (patch) | |
| tree | 054b9e1333fde16b2fcb947c468c21a67c5fc003 /drivers | |
| parent | be25710fff49935664a4cecd7ac52a1d804049e1 (diff) | |
| download | lwn-0dd6ec3a33cab9ee890c9ff671edea9202246c27.tar.gz lwn-0dd6ec3a33cab9ee890c9ff671edea9202246c27.zip | |
ipmi: set schedule_timeout_wait() value back to one
commit 8d1f66dc9b4f80a1441bc1c33efa98aca99e8813 upstream.
Fix a regression introduced by ae74e823cb7d ("ipmi: add parameter to limit
CPU usage in kipmid").
Some systems were seeing CPU usage go up dramatically with the recent
changes to try to reduce timer usage in the IPMI driver. This was traced
down to schedule_timeout_interruptible(1) being changed to
schedule_timeout_interruptbile(0). Revert that part of the change.
Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16147
Reported-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Tested-by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 9ead05d3cc89..7198491b6166 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -1003,7 +1003,7 @@ static int ipmi_thread(void *data) else if (smi_result == SI_SM_CALL_WITH_DELAY && busy_wait) schedule(); else - schedule_timeout_interruptible(0); + schedule_timeout_interruptible(1); } return 0; } |