From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756126AbbLDLwY (ORCPT ); Fri, 4 Dec 2015 06:52:24 -0500 Received: from terminus.zytor.com ([198.137.202.10]:59987 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756052AbbLDLwW (ORCPT ); Fri, 4 Dec 2015 06:52:22 -0500 Date: Fri, 4 Dec 2015 03:51:32 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: peterz@infradead.org, jolsa@kernel.org, eranian@google.com, jolsa@redhat.com, mingo@kernel.org, acme@redhat.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, tglx@linutronix.de, paulus@samba.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: acme@redhat.com, mingo@kernel.org, jolsa@redhat.com, jolsa@kernel.org, eranian@google.com, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, paulus@samba.org, tglx@linutronix.de, torvalds@linux-foundation.org, vincent.weaver@maine.edu In-Reply-To: <1447061071-28085-1-git-send-email-jolsa@kernel.org> References: <1447061071-28085-1-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel: Fix INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA macro Git-Commit-ID: 2a6ec339c0a04cab79151b19489b273079a4bd7a 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: 2a6ec339c0a04cab79151b19489b273079a4bd7a Gitweb: http://git.kernel.org/tip/2a6ec339c0a04cab79151b19489b273079a4bd7a Author: Jiri Olsa AuthorDate: Mon, 9 Nov 2015 10:24:31 +0100 Committer: Ingo Molnar CommitDate: Fri, 4 Dec 2015 10:08:06 +0100 perf/x86/intel: Fix INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA macro We need to add rest of the flags to the constraint mask instead of another INTEL_ARCH_EVENT_MASK, fixing a typo. Signed-off-by: Jiri Olsa Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1447061071-28085-1-git-send-email-jolsa@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index ce0ce26..56258f3 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -387,7 +387,7 @@ struct cpu_hw_events { /* Check flags and event code/umask, and set the HSW N/A flag */ #define INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA(code, n) \ __EVENT_CONSTRAINT(code, n, \ - INTEL_ARCH_EVENT_MASK|INTEL_ARCH_EVENT_MASK, \ + INTEL_ARCH_EVENT_MASK|X86_ALL_EVENT_FLAGS, \ HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_NA_HSW)