perf/x86: Fix wrmsrl() debug wrapper (1c2ac3fd) · Commits · 戴 / test

Move the wrmslr() debug wrapper to the common header now that all the include games are gone. Also clean it up a bit to avoid multiple evaluation of the argument. Signed-off-by:

Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/n/tip-l4gkfnivwv4yi5mqxjlovymx@git.kernel.org Signed-off-by:

Ingo Molnar <mingo@kernel.org>

arch/x86/kernel/cpu/perf_event.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -35,17 +35,6 @@

		#include "perf_event.h"

		#if 0
		#undef wrmsrl
		#define wrmsrl(msr, val) \
		do { \
		trace_printk("wrmsrl(%lx, %lx)\n", (unsigned long)(msr),\
		(unsigned long)(val)); \
		native_write_msr((msr), (u32)((u64)(val)), \
		(u32)((u64)(val) >> 32)); \
		} while (0)
		#endif

		struct x86_pmu x86_pmu __read_mostly;

		DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events) = {

arch/x86/kernel/cpu/perf_event.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,18 @@

		#include <linux/perf_event.h>

		#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

		/*
		* \| NHM/WSM \| SNB \|
		* register -------------------------------

Admin message