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

+2 -2
+1 -1
Documentation/local_ops.txt
··· 149 int cpu; 150 151 /* Increment the counters */ 152 - on_each_cpu(test_each, NULL, 0, 1); 153 /* Read all the counters */ 154 printk("Counters read from CPU %d\n", smp_processor_id()); 155 for_each_online_cpu(cpu) {
··· 149 int cpu; 150 151 /* Increment the counters */ 152 + on_each_cpu(test_each, NULL, 1); 153 /* Read all the counters */ 154 printk("Counters read from CPU %d\n", smp_processor_id()); 155 for_each_online_cpu(cpu) {
+1 -1
kernel/softlockup.c
··· 188 if ((long)(now - t->last_switch_timestamp) < 189 sysctl_hung_task_timeout_secs) 190 return; 191 - if (sysctl_hung_task_warnings < 0) 192 return; 193 sysctl_hung_task_warnings--; 194
··· 188 if ((long)(now - t->last_switch_timestamp) < 189 sysctl_hung_task_timeout_secs) 190 return; 191 + if (!sysctl_hung_task_warnings) 192 return; 193 sysctl_hung_task_warnings--; 194