Drop 'linux/uprobes.h' wrapper

[lttng-modules.git] / include / instrumentation / events / sched.h

diff --git a/include/instrumentation/events/sched.h b/include/instrumentation/events/sched.h
index 339bec945d3efd84db562934fcb358384d4b2eea..f10f94d4d8bfacf61b10f455f7f863e80a541e51 100644 (file)
--- a/include/instrumentation/events/sched.h
+++ b/include/instrumentation/events/sched.h
@@ -13,7 +13,6 @@
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
 #include <linux/sched/rt.h>
 #endif
-#include <wrapper/namespace.h>
 
 #define LTTNG_MAX_PID_NS_LEVEL 32
 
@@ -356,11 +355,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new,
 LTTNG_TRACEPOINT_EVENT(sched_switch,
 
        TP_PROTO(bool preempt,
-               unsigned int prev_state,
                struct task_struct *prev,
-               struct task_struct *next),
+               struct task_struct *next,
+               unsigned int prev_state),
 
-       TP_ARGS(preempt, prev_state, prev, next),
+       TP_ARGS(preempt, prev, next, prev_state),
 
        TP_FIELDS(
                ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
@@ -544,7 +543,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(parent);
                                        if (pid_ns)
                                                parent_ns_inum =
-                                                       pid_ns->lttng_ns_inum;
+                                                       pid_ns->ns.inum;
                                }
                                parent_ns_inum;
                        }))
@@ -564,7 +563,7 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork,
                                        pid_ns = task_active_pid_ns(child);
                                        if (pid_ns)
                                                child_ns_inum =
-                                                       pid_ns->lttng_ns_inum;
+                                                       pid_ns->ns.inum;
                                }
                                child_ns_inum;
                        }))