Merge branch 'core-fixes-for-linus' of... (3b666ce6) · Commits · 戴 / test

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

Documentation/local_ops.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -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--;