diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 06:39:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 06:39:41 +0100 |
commit | 3b666ce6a246cb9b89d335738d84af36883b911d (patch) | |
tree | 59ef04850352e6e748c308000ea4fe6e221d0dfc /kernel | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | check_hung_task(): unsigned sysctl_hung_task_warnings cannot be less than 0 (diff) | |
download | linux-3b666ce6a246cb9b89d335738d84af36883b911d.tar.xz linux-3b666ce6a246cb9b89d335738d84af36883b911d.zip |
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
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/softlockup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 3953e4aed733..dc0b3be6b7d5 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--; |