Commit ae71d4bf authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'perf-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
 "A single Kbuild dependency fix"

* tag 'perf-urgent-2020-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/rapl: Fix RAPL config variable bug
parents bc53f67d 16accae3
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
obj-y += core.o probe.o obj-y += core.o probe.o
obj-$(PERF_EVENTS_INTEL_RAPL) += rapl.o obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += rapl.o
obj-y += amd/ obj-y += amd/
obj-$(CONFIG_X86_LOCAL_APIC) += msr.o obj-$(CONFIG_X86_LOCAL_APIC) += msr.o
obj-$(CONFIG_CPU_SUP_INTEL) += intel/ obj-$(CONFIG_CPU_SUP_INTEL) += intel/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment