diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2020-11-24 11:26:11 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-11-24 11:26:11 +0100 |
| commit | 13c8da5db43ad6d9b8637295ff50ddb66a0af05f (patch) | |
| tree | 334417e5a8e9cec4c0576eef4e1dda5804a50825 /include/linux/sched.h | |
| parent | microblaze/mm/highmem: Add dropped #ifdef back (diff) | |
| parent | sched: Make migrate_disable/enable() independent of RT (diff) | |
| download | wireguard-linux-13c8da5db43ad6d9b8637295ff50ddb66a0af05f.tar.xz wireguard-linux-13c8da5db43ad6d9b8637295ff50ddb66a0af05f.zip | |
Merge branch 'sched/core' into core/mm
Pull the migrate disable mechanics which is a prerequisite for preemptible
kmap_local().
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 063cd120b459..a33f35f68060 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -714,6 +714,11 @@ struct task_struct { int nr_cpus_allowed; const cpumask_t *cpus_ptr; cpumask_t cpus_mask; + void *migration_pending; +#ifdef CONFIG_SMP + unsigned short migration_disabled; +#endif + unsigned short migration_flags; #ifdef CONFIG_PREEMPT_RCU int rcu_read_lock_nesting; |