diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:08:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:08:29 +0100 |
| commit | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (patch) | |
| tree | 5830ff0a0266c5500188d1ee9df8f2cbe0871b35 /arch/x86/kernel/cpu/Makefile | |
| parent | 8cacac6ecd6d289d4ab52590784636a5b1043c66 (diff) | |
| parent | c4b75479741c9c3a4f0abff5baa5013d27640ac1 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
| -rw-r--r-- | arch/x86/kernel/cpu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index d7a1e5a9331c..890f60083eca 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -30,7 +30,7 @@ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_X86_FEATURE_NAMES) += capflags.o powerflags.o ifdef CONFIG_CPU_SUP_INTEL -obj-y += intel.o intel_pconfig.o +obj-y += intel.o intel_pconfig.o tsx.o obj-$(CONFIG_PM) += intel_epb.o endif obj-$(CONFIG_CPU_SUP_AMD) += amd.o |