diff options
| author |   Kees Cook <keescook@chromium.org> | 2021-09-30 10:36:44 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2021-09-30 10:36:44 -0700 |
| commit | d9f2a53f64a6fcae994457e64a7124d2a3efd323 (patch) | |
| tree | 858e12d8312831e089a2babc077ced917c27f47d /kernel/sched/sched.h | |
| parent | Linux 5.15-rc2 (diff) | |
| parent | riscv: rely on core code to keep thread_info::cpu updated (diff) | |
| download | linux-dev-d9f2a53f64a6fcae994457e64a7124d2a3efd323.tar.xz linux-dev-d9f2a53f64a6fcae994457e64a7124d2a3efd323.zip | |
Merge tag 'pr-move-task-cpu-to-ti' of git://git.kernel.org/pub/scm/linux/kernel/git/ardb/linux.git
Cross-architecture update to move task_struct::cpu back into thread_info
on arm64, x86, s390, powerpc, and riscv. All Acked by arch maintainers.
Quoting Ard Biesheuvel:
"Move task_struct::cpu back into thread_info
Keeping CPU in task_struct is problematic for architectures that define
raw_smp_processor_id() in terms of this field, as it requires
linux/sched.h to be included, which causes a lot of pain in terms of
circular dependencies (aka 'header soup')
This series moves it back into thread_info (where it came from) for all
architectures that enable THREAD_INFO_IN_TASK, addressing the header
soup issue as well as some pointless differences in the implementations
of task_cpu() and set_task_cpu()."
Diffstat (limited to 'kernel/sched/sched.h')
| -rw-r--r-- | kernel/sched/sched.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 3d3e5793e117..79fcbad11450 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1926,11 +1926,7 @@ static inline void __set_task_cpu(struct task_struct *p, unsigned int cpu) * per-task data have been completed by this moment. */ smp_wmb(); -#ifdef CONFIG_THREAD_INFO_IN_TASK - WRITE_ONCE(p->cpu, cpu); -#else WRITE_ONCE(task_thread_info(p)->cpu, cpu); -#endif p->wake_cpu = cpu; #endif } |