From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752914AbbE0KDs (ORCPT ); Wed, 27 May 2015 06:03:48 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33431 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751418AbbE0KDp (ORCPT ); Wed, 27 May 2015 06:03:45 -0400 Date: Wed, 27 May 2015 03:03:11 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: mingo@kernel.org, peterz@infradead.org, matt.fleming@intel.com, linux-kernel@vger.kernel.org, vikas.shivappa@linux.intel.com, torvalds@linux-foundation.org, tglx@linutronix.de, kanaka.d.juvva@intel.com, will.auld@intel.com, hpa@zytor.com Reply-To: hpa@zytor.com, will.auld@intel.com, kanaka.d.juvva@intel.com, vikas.shivappa@linux.intel.com, tglx@linutronix.de, torvalds@linux-foundation.org, matt.fleming@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org In-Reply-To: <20150518235149.919350144@linutronix.de> References: <20150518235149.919350144@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/cqm: Use proper data types Git-Commit-ID: b3df4ec4424f27e55d754cfe586195fecca1c4e4 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: b3df4ec4424f27e55d754cfe586195fecca1c4e4 Gitweb: http://git.kernel.org/tip/b3df4ec4424f27e55d754cfe586195fecca1c4e4 Author: Thomas Gleixner AuthorDate: Tue, 19 May 2015 00:00:51 +0000 Committer: Ingo Molnar CommitDate: Wed, 27 May 2015 09:17:39 +0200 perf/x86/intel/cqm: Use proper data types 'int' is really not a proper data type for an MSR. Use u32 to make it clear that we are dealing with a 32-bit unsigned hardware value. Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Acked-by: Matt Fleming Cc: Kanaka Juvva Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Vikas Shivappa Cc: Will Auld Link: http://lkml.kernel.org/r/20150518235149.919350144@linutronix.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event_intel_cqm.c | 4 ++-- include/linux/perf_event.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c index 572582e..3e9a7fb 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c +++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c @@ -18,7 +18,7 @@ static unsigned int cqm_l3_scale; /* supposedly cacheline size */ struct intel_cqm_state { raw_spinlock_t lock; - int rmid; + u32 rmid; int cnt; }; @@ -962,7 +962,7 @@ out: static void intel_cqm_event_start(struct perf_event *event, int mode) { struct intel_cqm_state *state = this_cpu_ptr(&cqm_state); - unsigned int rmid = event->hw.cqm_rmid; + u32 rmid = event->hw.cqm_rmid; unsigned long flags; if (!(event->hw.cqm_state & PERF_HES_STOPPED)) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 248f782..0658002 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -120,7 +120,7 @@ struct hw_perf_event { }; struct { /* intel_cqm */ int cqm_state; - int cqm_rmid; + u32 cqm_rmid; struct list_head cqm_events_entry; struct list_head cqm_groups_entry; struct list_head cqm_group_entry;