Skip to contentSkip to conversation

msr tracing: Fix copy paste

PATCH New Dr. David Alan Gilbert (git) 2 participants 2 messages Jun 3, 2016 – Jun 6, 2016 x86

lore
Share & tools
lore

Dr. David Alan Gilbert (git)

author
#0 lore raw

PATCH 1/1 msr tracing: Fix copy paste

From: "Dr. David Alan Gilbert" <[email protected]>

The msr tracing for writes is incorrectly conditional on the read trace.

Fixes 7f47d8cc
Signed-off-by Dr. David Alan Gilbert <[email protected]>
---
 arch/x86/include/asm/msr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/msr.h +2 -2
index 7dc1d8f..b5fee97 100644
@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr,
 		     "2:\n"
 		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
 		     : : "c" (msr), "a"(low), "d" (high) : "memory");
-	if (msr_tracepoint_active(__tracepoint_read_msr))
+	if (msr_tracepoint_active(__tracepoint_write_msr))
 		do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
 }
 

@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr,
 		     : "c" (msr), "0" (low), "d" (high),
 		       [fault] "i" (-EIO)
 		     : "memory");
-	if (msr_tracepoint_active(__tracepoint_read_msr))
+	if (msr_tracepoint_active(__tracepoint_write_msr))
 		do_trace_write_msr(msr, ((u64)high << 32 | low), err);
 	return err;
 }
Signature · 1 line
2.7.4
merge bot
#1 lore raw

[tip:x86/urgent] x86/msr: Use the proper trace point conditional for writes

x86/msr: Use the proper trace point conditional for writes
Commit-ID:  08dd8cd06ed95625b9e2fac43c78fcb45b7eaf94
Gitweb:     http://git.kernel.org/tip/08dd8cd06ed95625b9e2fac43c78fcb45b7eaf94
Author:     Dr. David Alan Gilbert <[email protected]>
AuthorDate: Fri, 3 Jun 2016 19:00:59 +0100
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Mon, 6 Jun 2016 15:33:39 +0200

x86/msr: Use the proper trace point conditional for writes

The msr tracing for writes is incorrectly conditional on the read trace.

Fixes 7f47d8cc039f "x86, tracing, perf: Add trace point for MSR accesses"
Signed-off-by Dr. David Alan Gilbert <[email protected]>
Cc [email protected]
Cc [email protected]
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Thomas Gleixner <[email protected]>
---
 arch/x86/include/asm/msr.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/msr.h +2 -2
index 7dc1d8f..b5fee97 100644
@@ -122,7 +122,7 @@ notrace static inline void native_write_msr(unsigned int msr,
 		     "2:\n"
 		     _ASM_EXTABLE_HANDLE(1b, 2b, ex_handler_wrmsr_unsafe)
 		     : : "c" (msr), "a"(low), "d" (high) : "memory");
-	if (msr_tracepoint_active(__tracepoint_read_msr))
+	if (msr_tracepoint_active(__tracepoint_write_msr))
 		do_trace_write_msr(msr, ((u64)high << 32 | low), 0);
 }
 

@@ -141,7 +141,7 @@ notrace static inline int native_write_msr_safe(unsigned int msr,
 		     : "c" (msr), "0" (low), "d" (high),
 		       [fault] "i" (-EIO)
 		     : "memory");
-	if (msr_tracepoint_active(__tracepoint_read_msr))
+	if (msr_tracepoint_active(__tracepoint_write_msr))
 		do_trace_write_msr(msr, ((u64)high << 32 | low), err);
 	return err;
 }