From b602c90cf6990ecc4191c24b5827de111fd40c19 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Wed, 27 Jun 2012 09:41:39 +0900
Subject: [PATCH] --- yaml --- r: 312351 b: refs/heads/master c:
 b102f1d0f1cd0bb5ec82e5aeb1e33502d6ad6710 h: refs/heads/master i:   312349:
 bce0541f3bca6d0e5addd6d61dc71e3247e8a4ec   312347:
 622d40ffcbad9d5bb4b6bacf081f268f3bd5bd6d   312343:
 06cd84a9b0b75baa8910dbe1529d88a679dce516   312335:
 b95d2191ec212fce0eaf2776d7ed617e9861ed75   312319:
 30705be4ba09b38b14fe889774b72ac0b9494320 v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/kvm/trace.h   | 12 +-----------
 trunk/include/trace/ftrace.h |  1 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 6df6a747bebc..4a4ebda12c70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0be61ebc18b919dddbdbcd1c4f42513c310ecf59
+refs/heads/master: b102f1d0f1cd0bb5ec82e5aeb1e33502d6ad6710
diff --git a/trunk/arch/x86/kvm/trace.h b/trunk/arch/x86/kvm/trace.h
index 911d2641f14c..62d02e3c3ed6 100644
--- a/trunk/arch/x86/kvm/trace.h
+++ b/trunk/arch/x86/kvm/trace.h
@@ -710,16 +710,6 @@ TRACE_EVENT(kvm_skinit,
 		  __entry->rip, __entry->slb)
 );
 
-#define __print_insn(insn, ilen) ({		                 \
-	int i;							 \
-	const char *ret = p->buffer + p->len;			 \
-								 \
-	for (i = 0; i < ilen; ++i)				 \
-		trace_seq_printf(p, " %02x", insn[i]);		 \
-	trace_seq_printf(p, "%c", 0);				 \
-	ret;							 \
-	})
-
 #define KVM_EMUL_INSN_F_CR0_PE (1 << 0)
 #define KVM_EMUL_INSN_F_EFL_VM (1 << 1)
 #define KVM_EMUL_INSN_F_CS_D   (1 << 2)
@@ -786,7 +776,7 @@ TRACE_EVENT(kvm_emulate_insn,
 
 	TP_printk("%x:%llx:%s (%s)%s",
 		  __entry->csbase, __entry->rip,
-		  __print_insn(__entry->insn, __entry->len),
+		  __print_hex(__entry->insn, __entry->len),
 		  __print_symbolic(__entry->flags,
 				   kvm_trace_symbol_emul_flags),
 		  __entry->failed ? " failed" : ""
diff --git a/trunk/include/trace/ftrace.h b/trunk/include/trace/ftrace.h
index 769724944fc6..c6bc2faaf261 100644
--- a/trunk/include/trace/ftrace.h
+++ b/trunk/include/trace/ftrace.h
@@ -571,6 +571,7 @@ static inline void ftrace_test_probe_##call(void)			\
 
 #undef __print_flags
 #undef __print_symbolic
+#undef __print_hex
 #undef __get_dynamic_array
 #undef __get_str