diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-16 13:26:08 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-01-16 13:00:24 -0600 |
| commit | 0d39d424badea1743c1afe66c9594ccdbbaa0a44 (patch) | |
| tree | d558ae3f227a0cc414bceea088fd24a1c1b9a609 /include/linux | |
| parent | fec5e706c1da3723fe2f82435fdded8460def789 (diff) | |
sched-migrate-disable.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/preempt.h | 8 | ||||
| -rw-r--r-- | include/linux/sched.h | 13 | ||||
| -rw-r--r-- | include/linux/smp.h | 1 |
3 files changed, 18 insertions, 4 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index 29db25f50861..363e5e277a3b 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -108,6 +108,14 @@ do { \ #endif /* CONFIG_PREEMPT_COUNT */ +#ifdef CONFIG_SMP +extern void migrate_disable(void); +extern void migrate_enable(void); +#else +# define migrate_disable() do { } while (0) +# define migrate_enable() do { } while (0) +#endif + #ifdef CONFIG_PREEMPT_RT_FULL # define preempt_disable_rt() preempt_disable() # define preempt_enable_rt() preempt_enable() diff --git a/include/linux/sched.h b/include/linux/sched.h index e76a82684b8a..2efe72958932 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1259,6 +1259,7 @@ struct task_struct { #endif unsigned int policy; + int migrate_disable; cpumask_t cpus_allowed; #ifdef CONFIG_PREEMPT_RCU @@ -1594,9 +1595,6 @@ struct task_struct { #endif }; -/* Future-safe accessor for struct task_struct's cpus_allowed. */ -#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed) - #ifdef CONFIG_PREEMPT_RT_FULL static inline bool cur_pf_disabled(void) { return current->pagefault_disabled; } #else @@ -2679,6 +2677,15 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu) #endif /* CONFIG_SMP */ +/* Future-safe accessor for struct task_struct's cpus_allowed. */ +static inline const struct cpumask *tsk_cpus_allowed(struct task_struct *p) +{ + if (p->migrate_disable) + return cpumask_of(task_cpu(p)); + + return &p->cpus_allowed; +} + extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask); extern long sched_getaffinity(pid_t pid, struct cpumask *mask); diff --git a/include/linux/smp.h b/include/linux/smp.h index e6c58d8796b3..94c8430da063 100644 --- a/include/linux/smp.h +++ b/include/linux/smp.h @@ -80,7 +80,6 @@ void __smp_call_function_single(int cpuid, struct call_single_data *data, int smp_call_function_any(const struct cpumask *mask, smp_call_func_t func, void *info, int wait); - /* * Generic and arch helpers */ |