Merge branch 'linus' into tracing/urgent

2008-07-24 08:09:26 +02:00
parent 1e01cb0c6f 338b9bb3ad
commit 28afe961a1
3139 changed files with 245154 additions and 140486 deletions
@@ -213,7 +213,9 @@ static void start_stack_timers(void)
 	int cpu;

 	for_each_online_cpu(cpu) {
-		set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
+		cpumask_of_cpu_ptr(new_mask, cpu);
+
+		set_cpus_allowed_ptr(current, new_mask);
 		start_stack_timer(cpu);
 	}
 	set_cpus_allowed_ptr(current, &saved_mask);