diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-02-11 08:01:50 +0100 |
commit | c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d (patch) | |
tree | b15d53e69f73b160b4625e91187cd436c5a3e683 /include/linux/sched.h | |
parent | sched/fair: Fix insertion in rq->leaf_cfs_rq_list (diff) | |
parent | Linux 5.0-rc6 (diff) | |
download | linux-dev-c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d.tar.xz linux-dev-c9ba7560c550fe6c1f4a8f0666bea41d2a349d1d.zip |
Merge tag 'v5.0-rc6' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 4112639c2a85..18696a194e06 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -987,7 +987,7 @@ struct task_struct { /* cg_list protected by css_set_lock and tsk->alloc_lock: */ struct list_head cg_list; #endif -#ifdef CONFIG_X86_RESCTRL +#ifdef CONFIG_X86_CPU_RESCTRL u32 closid; u32 rmid; #endif |