tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Check if lowest_mask is initialized in find_lowest_rq()
sched: Fix need_resched() when checking peempt

Linus Torvalds a1b6ae8e 21c5977a

+5 -1
+5 -1
kernel/sched_rt.c
··· 1096 1096 * to move current somewhere else, making room for our non-migratable 1097 1097 * task. 1098 1098 */ 1099 - if (p->prio == rq->curr->prio && !need_resched()) 1099 + if (p->prio == rq->curr->prio && !test_tsk_need_resched(rq->curr)) 1100 1100 check_preempt_equal_prio(rq, p); 1101 1101 #endif 1102 1102 } ··· 1238 1238 struct cpumask *lowest_mask = __get_cpu_var(local_cpu_mask); 1239 1239 int this_cpu = smp_processor_id(); 1240 1240 int cpu = task_cpu(task); 1241 + 1242 + /* Make sure the mask is initialized first */ 1243 + if (unlikely(!lowest_mask)) 1244 + return -1; 1241 1245 1242 1246 if (task->rt.nr_cpus_allowed == 1) 1243 1247 return -1; /* No other targets possible */