Commit ae71d4bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/x86/events/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

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-$(CONFIG_X86_LOCAL_APIC)            += msr.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= intel/