2 files changed, 2 insertions, 11 deletions

diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 911d2641f14c..62d02e3c3ed6 100644
--- a/arch/x86/kvm/trace.h
+++ b/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/include/trace/ftrace.h b/include/trace/ftrace.h
index 769724944fc6..c6bc2faaf261 100644
--- a/include/trace/ftrace.h
+++ b/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