1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index a7ab350bce98..799e6bd58cc1 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -14,17 +14,7 @@
 #include <linux/perf_event.h>
-#if 0
+/* To enable MSR tracing please use the generic trace points. */
-#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
 /*
 *          |   NHM/WSM    |      SNB     |

diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h index a7ab350bce98..799e6bd58cc1 100644 --- a/arch/x86/kernel/cpu/perf_event.h +++ b/arch/x86/kernel/cpu/perf_event.h
@@ -14,17 +14,7 @@
14		14
15	#include <linux/perf_event.h>	15	#include <linux/perf_event.h>
16		16
17	#if 0	17	/* To enable MSR tracing please use the generic trace points. */
18	#undef wrmsrl
19	#define wrmsrl(msr, val) \
20	do { \
21	unsigned int _msr = (msr); \
22	u64 _val = (val); \
23	trace_printk("wrmsrl(%x, %Lx)\n", (unsigned int)(_msr), \
24	(unsigned long long)(_val)); \
25	native_write_msr((_msr), (u32)(_val), (u32)(_val >> 32)); \
26	} while (0)
27	#endif
28		18
29	/*	19	/*
30	* \| NHM/WSM \| SNB \|	20	* \| NHM/WSM \| SNB \|