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 /fs | |
| parent | microblaze/mm/highmem: Add dropped #ifdef back (diff) | |
| parent | sched: Make migrate_disable/enable() independent of RT (diff) | |
| download | linux-13c8da5db43ad6d9b8637295ff50ddb66a0af05f.tar.xz 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 'fs')
| -rw-r--r-- | fs/proc/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 65ec2029fa80..7052441be967 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -382,9 +382,9 @@ static inline void task_context_switch_counts(struct seq_file *m, static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) { seq_printf(m, "Cpus_allowed:\t%*pb\n", - cpumask_pr_args(task->cpus_ptr)); + cpumask_pr_args(&task->cpus_mask)); seq_printf(m, "Cpus_allowed_list:\t%*pbl\n", - cpumask_pr_args(task->cpus_ptr)); + cpumask_pr_args(&task->cpus_mask)); } static inline void task_core_dumping(struct seq_file *m, struct mm_struct *mm) |