From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932091AbbCWM03 (ORCPT ); Mon, 23 Mar 2015 08:26:29 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41477 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372AbbCWM0Y (ORCPT ); Mon, 23 Mar 2015 08:26:24 -0400 Date: Mon, 23 Mar 2015 05:25:51 -0700 From: tip-bot for Matt Fleming Message-ID: Cc: peterz@infradead.org, kanaka.d.juvva@intel.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, matt.fleming@intel.com, mingo@kernel.org, hpa@zytor.com, jolsa@redhat.com, tglx@linutronix.de, acme@redhat.com, vikas.shivappa@linux.intel.com Reply-To: matt.fleming@intel.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, kanaka.d.juvva@intel.com, peterz@infradead.org, vikas.shivappa@linux.intel.com, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, jolsa@redhat.com, mingo@kernel.org In-Reply-To: <1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com> References: <1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/x86] perf/x86/intel: Fix Makefile to actually build the cqm driver Git-Commit-ID: 4e16ed99416ef569a89782a7234f95007919fadd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4e16ed99416ef569a89782a7234f95007919fadd Gitweb: http://git.kernel.org/tip/4e16ed99416ef569a89782a7234f95007919fadd Author: Matt Fleming AuthorDate: Thu, 26 Feb 2015 18:47:00 +0000 Committer: Ingo Molnar CommitDate: Mon, 23 Mar 2015 10:58:03 +0100 perf/x86/intel: Fix Makefile to actually build the cqm driver Someone fat fingered a merge conflict and lost the Makefile hunk. Signed-off-by: Matt Fleming Signed-off-by: Peter Zijlstra (Intel) Cc: Cc: Cc: Cc: Cc: Cc: Cc: Link: http://lkml.kernel.org/r/1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 80091ae..6c1ca13 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -39,7 +39,7 @@ obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o endif obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o perf_event_intel_cqm.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \ perf_event_intel_uncore_snb.o \