diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 12:00:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 12:00:29 -0800 |
| commit | 4244057c3da1dde07c0f338ea32fed6e79d6a657 (patch) | |
| tree | 1559c86923f4bffea50be23f0a58958ba0cfbe96 /arch/x86/Kconfig | |
| parent | 6b90e71a472be131186276a5fd19d319fa2125d9 (diff) | |
| parent | e79f15a4598c1f3f3f7f3319ca308c63c91fdaf2 (diff) | |
Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 resource control updates from Ingo Molnar:
"The main change in this tree is the extension of the resctrl procfs
ABI with a new file that helps tooling to navigate from tasks back to
resctrl groups: /proc/{pid}/cpu_resctrl_groups.
Also fix static key usage for certain feature combinations and
simplify the task exit resctrl case"
* 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/resctrl: Add task resctrl information display
x86/resctrl: Check monitoring static key in the MBM overflow handler
x86/resctrl: Do not reconfigure exiting tasks
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 56e3445972c3..3d6c8116254d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -457,6 +457,7 @@ config X86_CPU_RESCTRL bool "x86 CPU resource control support" depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD) select KERNFS + select PROC_CPU_RESCTRL if PROC_FS help Enable x86 CPU resource control support. |