mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 13:44:26 -04:00
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: cpuset: Fix cpuset_cpus_allowed_fallback(), don't update tsk->rt.nr_cpus_allowed sched: Fix ->min_vruntime calculation in dequeue_entity() sched: Fix ttwu() for __ARCH_WANT_INTERRUPTS_ON_CTXSW sched: More sched_domain iterations fixes
This commit is contained in:
commit
08a8b79600
8 changed files with 65 additions and 27 deletions
|
|
@ -146,7 +146,7 @@ static inline void cpuset_cpus_allowed(struct task_struct *p,
|
|||
|
||||
static inline int cpuset_cpus_allowed_fallback(struct task_struct *p)
|
||||
{
|
||||
cpumask_copy(&p->cpus_allowed, cpu_possible_mask);
|
||||
do_set_cpus_allowed(p, cpu_possible_mask);
|
||||
return cpumask_any(cpu_active_mask);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1841,9 +1841,16 @@ static inline void rcu_copy_process(struct task_struct *p)
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
extern void do_set_cpus_allowed(struct task_struct *p,
|
||||
const struct cpumask *new_mask);
|
||||
|
||||
extern int set_cpus_allowed_ptr(struct task_struct *p,
|
||||
const struct cpumask *new_mask);
|
||||
#else
|
||||
static inline void do_set_cpus_allowed(struct task_struct *p,
|
||||
const struct cpumask *new_mask)
|
||||
{
|
||||
}
|
||||
static inline int set_cpus_allowed_ptr(struct task_struct *p,
|
||||
const struct cpumask *new_mask)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue