summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-04 21:39:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-04 21:39:41 -0800
commit3b666ce6a246cb9b89d335738d84af36883b911d (patch)
tree59ef04850352e6e748c308000ea4fe6e221d0dfc
parent56d18e9932ebf4e8eca42d2ce509450e6c9c1666 (diff)
parent201955463a5c1a70d3f70d1598b27e4c2c402642 (diff)
downloadop-kernel-dev-3b666ce6a246cb9b89d335738d84af36883b911d.zip
op-kernel-dev-3b666ce6a246cb9b89d335738d84af36883b911d.tar.gz
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: check_hung_task(): unsigned sysctl_hung_task_warnings cannot be less than 0 documentation: local_ops fix on_each_cpu
-rw-r--r--Documentation/local_ops.txt2
-rw-r--r--kernel/softlockup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/local_ops.txt b/Documentation/local_ops.txt
index f4f8b1c..23045b8 100644
--- a/Documentation/local_ops.txt
+++ b/Documentation/local_ops.txt
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
int cpu;
/* Increment the counters */
- on_each_cpu(test_each, NULL, 0, 1);
+ on_each_cpu(test_each, NULL, 1);
/* Read all the counters */
printk("Counters read from CPU %d\n", smp_processor_id());
for_each_online_cpu(cpu) {
diff --git a/kernel/softlockup.c b/kernel/softlockup.c
index 3953e4a..dc0b3be 100644
--- a/kernel/softlockup.c
+++ b/kernel/softlockup.c
@@ -188,7 +188,7 @@ static void check_hung_task(struct task_struct *t, unsigned long now)
if ((long)(now - t->last_switch_timestamp) <
sysctl_hung_task_timeout_secs)
return;
- if (sysctl_hung_task_warnings < 0)
+ if (!sysctl_hung_task_warnings)
return;
sysctl_hung_task_warnings--;
OpenPOWER on IntegriCloud