1 files changed, 23 insertions, 3 deletions

diff --git a/arch/s390/kvm/trace-s390.h b/arch/s390/kvm/trace-s390.h
index 90fdf85b5ff7..13f30f58a2df 100644
--- a/arch/s390/kvm/trace-s390.h
+++ b/arch/s390/kvm/trace-s390.h
@@ -141,13 +141,13 @@ TRACE_EVENT(kvm_s390_inject_vcpu,
  * Trace point for the actual delivery of interrupts.
  */
 TRACE_EVENT(kvm_s390_deliver_interrupt,
-            TP_PROTO(unsigned int id, __u64 type, __u32 data0, __u64 data1),
+            TP_PROTO(unsigned int id, __u64 type, __u64 data0, __u64 data1),
             TP_ARGS(id, type, data0, data1),
 
             TP_STRUCT__entry(
                     __field(int, id)
                     __field(__u32, inttype)
-                    __field(__u32, data0)
+                    __field(__u64, data0)
                     __field(__u64, data1)
                     ),
 
@@ -159,7 +159,7 @@ TRACE_EVENT(kvm_s390_deliver_interrupt,
                     ),
 
             TP_printk("deliver interrupt (vcpu %d): type:%x (%s) "      \
-                      "data:%08x %016llx",
+                      "data:%08llx %016llx",
                       __entry->id, __entry->inttype,
                       __print_symbolic(__entry->inttype, kvm_s390_int_type),
                       __entry->data0, __entry->data1)
@@ -204,6 +204,26 @@ TRACE_EVENT(kvm_s390_stop_request,
         );
 
 
+/*
+ * Trace point for enabling channel I/O instruction support.
+ */
+TRACE_EVENT(kvm_s390_enable_css,
+            TP_PROTO(void *kvm),
+            TP_ARGS(kvm),
+
+            TP_STRUCT__entry(
+                    __field(void *, kvm)
+                    ),
+
+            TP_fast_assign(
+                    __entry->kvm = kvm;
+                    ),
+
+            TP_printk("enabling channel I/O support (kvm @ %p)\n",
+                      __entry->kvm)
+        );
+
+
 #endif /* _TRACE_KVMS390_H */
 
 /* This part must be outside protection */