From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754478AbbBZTkr (ORCPT <rfc822;w@1wt.eu>);
	Thu, 26 Feb 2015 14:40:47 -0500
Received: from casper.infradead.org ([85.118.1.10]:58948 "EHLO
	casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753798AbbBZTkq (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 26 Feb 2015 14:40:46 -0500
Date: Thu, 26 Feb 2015 20:40:33 +0100
From: Peter Zijlstra <peterz@infradead.org>
To: Matt Fleming <matt.fleming@intel.com>
Cc: mingo@kernel.org, jolsa@redhat.com, torvalds@linux-foundation.org,
        linux-kernel@vger.kernel.org, acme@kernel.org, acme@redhat.com,
        hpa@zytor.com, kanaka.d.juvva@intel.com,
        vikas.shivappa@linux.intel.com, tglx@linutronix.de,
        linux-tip-commits@vger.kernel.org
Subject: Re: [tip:perf/x86] perf/x86/intel: Add Intel Cache QoS Monitoring
 support
Message-ID: <20150226194033.GZ21418@twins.programming.kicks-ass.net>
References: <1422038748-21397-6-git-send-email-matt@codeblueprint.co.uk>
 <tip-4afbb24ce5e723c8a093a6674a3c33062175078a@git.kernel.org>
 <1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1424976420.15321.35.camel@mfleming-mobl1.ger.corp.intel.com>
User-Agent: Mutt/1.5.21 (2012-12-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Feb 26, 2015 at 06:47:00PM +0000, Matt Fleming wrote:
> Weird. I just noticed that the Makefile hunk got dropped. Was that
> intentional?
> 
> diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
> index 80091ae54c2b..6c1ca139f736 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 \
> 

Nope, I checked my version and it appears I lost it somewhere. Maybe
rebase fail :/