From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756239AbbLDMAn (ORCPT ); Fri, 4 Dec 2015 07:00:43 -0500 Received: from terminus.zytor.com ([198.137.202.10]:60395 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbbLDMAl (ORCPT ); Fri, 4 Dec 2015 07:00:41 -0500 Date: Fri, 4 Dec 2015 04:00:01 -0800 From: tip-bot for Andi Kleen Message-ID: Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, vincent.weaver@maine.edu, eranian@google.com, efault@gmx.de, ak@linux.intel.com, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com, jolsa@redhat.com, acme@redhat.com Reply-To: vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, jolsa@redhat.com, acme@redhat.com, ak@linux.intel.com, mingo@kernel.org, eranian@google.com, efault@gmx.de, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <1449018060-1742-4-git-send-email-andi@firstfloor.org> References: <1449018060-1742-4-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Remove old MSR perf tracing code Git-Commit-ID: 23147ce9aca551931f8f17bb520b370df884f918 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: 23147ce9aca551931f8f17bb520b370df884f918 Gitweb: http://git.kernel.org/tip/23147ce9aca551931f8f17bb520b370df884f918 Author: Andi Kleen AuthorDate: Tue, 1 Dec 2015 17:01:00 -0800 Committer: Ingo Molnar CommitDate: Fri, 4 Dec 2015 10:58:35 +0100 perf/x86: Remove old MSR perf tracing code Now that we have generic MSR trace points we can remove the old hackish perf MSR read tracing code. Signed-off-by: Andi Kleen Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: rostedt@goodmis.org Link: http://lkml.kernel.org/r/1449018060-1742-4-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/perf_event.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index 910928f..ce8768f 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h @@ -14,17 +14,7 @@ #include -#if 0 -#undef wrmsrl -#define wrmsrl(msr, val) \ -do { \ - unsigned int _msr = (msr); \ - u64 _val = (val); \ - trace_printk("wrmsrl(%x, %Lx)\n", (unsigned int)(_msr), \ - (unsigned long long)(_val)); \ - native_write_msr((_msr), (u32)(_val), (u32)(_val >> 32)); \ -} while (0) -#endif +/* To enable MSR tracing please use the generic trace points. */ /* * | NHM/WSM | SNB |