Commit 612f0c0b authored Jan 26, 2017 by Borislav Petkov Committed by Ingo Molnar Jan 30, 2017

perf/x86/events: Add an AMD-specific Makefile



Move the AMD pieces from the generic Makefile so that

  $ make arch/x86/events/amd/<file>.s

can work too. Otherwise you get:

  $ make arch/x86/events/amd/ibs.s
  scripts/Makefile.build:44: arch/x86/events/amd/Makefile: No such file or directory
  make[1]: *** No rule to make target 'arch/x86/events/amd/Makefile'.  Stop.
  Makefile:1636: recipe for target 'arch/x86/events/amd/ibs.s' failed
  make: *** [arch/x86/events/amd/ibs.s] Error 2

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/20170126080819.417-1-bp@alien8.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent da6adaea

arch/x86/events/Makefile

+3 −10

Original line number	Diff line number	Diff line
		obj-y += core.o

		obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o amd/uncore.o
		obj-$(CONFIG_PERF_EVENTS_AMD_POWER) += amd/power.o
		obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o msr.o
		ifdef CONFIG_AMD_IOMMU
		obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o
		endif

		obj-$(CONFIG_CPU_SUP_INTEL) += msr.o
		obj-y += amd/
		obj-$(CONFIG_X86_LOCAL_APIC) += msr.o
		obj-$(CONFIG_CPU_SUP_INTEL) += intel/

arch/x86/events/amd/Makefile

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		obj-$(CONFIG_CPU_SUP_AMD) += core.o uncore.o
		obj-$(CONFIG_PERF_EVENTS_AMD_POWER) += power.o
		obj-$(CONFIG_X86_LOCAL_APIC) += ibs.o
		ifdef CONFIG_AMD_IOMMU
		obj-$(CONFIG_CPU_SUP_AMD) += iommu.o
		endif

Admin message