diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 13:09:45 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-11-29 13:09:45 +1100 |
| commit | a8414409387eeca841734aacf9180ac918341117 (patch) | |
| tree | 0e39019a04f641e279fc46aa59262ce59d584f6d /include/linux/sched.h | |
| parent | 49f2b891ee88735f9a00ddd7a4e4abc9626af212 (diff) | |
| parent | fd20b0c7a2bf635fa4ec2f99ee85f0bf59612485 (diff) | |
| download | linux-next-a8414409387eeca841734aacf9180ac918341117.tar.gz | |
Merge remote-tracking branch 'tip/auto-latest'
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 a51c13c2b1a0..7952dfba2c76 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -993,7 +993,7 @@ struct task_struct { /* cg_list protected by css_set_lock and tsk->alloc_lock: */ struct list_head cg_list; #endif -#ifdef CONFIG_INTEL_RDT +#ifdef CONFIG_RESCTRL u32 closid; u32 rmid; #endif |