update

[l4.git] / l4 / pkg / linux-26-headers / include / linux / cn_proc.h

diff --git a/l4/pkg/linux-26-headers/include/linux/cn_proc.h b/l4/pkg/linux-26-headers/include/linux/cn_proc.h
index 1c86d65bc4b9aaf8aa9955bb283fd0670a05bf39..a4589965399d93420987db9c03240568376f5bed 100644 (file)
--- a/l4/pkg/linux-26-headers/include/linux/cn_proc.h
+++ b/l4/pkg/linux-26-headers/include/linux/cn_proc.h
@@ -52,6 +52,9 @@ struct proc_event {
                PROC_EVENT_EXEC = 0x00000002,
                PROC_EVENT_UID  = 0x00000004,
                PROC_EVENT_GID  = 0x00000040,
+               PROC_EVENT_SID  = 0x00000080,
+               PROC_EVENT_PTRACE = 0x00000100,
+               PROC_EVENT_COMM = 0x00000200,
                /* "next" should be 0x00000400 */
                /* "last" is the last process event: exit */
                PROC_EVENT_EXIT = 0x80000000
@@ -65,20 +68,20 @@ struct proc_event {
                } ack;
 
                struct fork_proc_event {
-                       pid_t parent_pid;
-                       pid_t parent_tgid;
-                       pid_t child_pid;
-                       pid_t child_tgid;
+                       __kernel_pid_t parent_pid;
+                       __kernel_pid_t parent_tgid;
+                       __kernel_pid_t child_pid;
+                       __kernel_pid_t child_tgid;
                } fork;
 
                struct exec_proc_event {
-                       pid_t process_pid;
-                       pid_t process_tgid;
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
                } exec;
 
                struct id_proc_event {
-                       pid_t process_pid;
-                       pid_t process_tgid;
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
                        union {
                                __u32 ruid; /* task uid */
                                __u32 rgid; /* task gid */
@@ -89,33 +92,30 @@ struct proc_event {
                        } e;
                } id;
 
+               struct sid_proc_event {
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
+               } sid;
+
+               struct ptrace_proc_event {
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
+                       __kernel_pid_t tracer_pid;
+                       __kernel_pid_t tracer_tgid;
+               } ptrace;
+
+               struct comm_proc_event {
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
+                       char           comm[16];
+               } comm;
+
                struct exit_proc_event {
-                       pid_t process_pid;
-                       pid_t process_tgid;
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
                        __u32 exit_code, exit_signal;
                } exit;
        } event_data;
 };
 
-#ifdef __KERNEL__
-#ifdef CONFIG_PROC_EVENTS
-void proc_fork_connector(struct task_struct *task);
-void proc_exec_connector(struct task_struct *task);
-void proc_id_connector(struct task_struct *task, int which_id);
-void proc_exit_connector(struct task_struct *task);
-#else
-static inline void proc_fork_connector(struct task_struct *task)
-{}
-
-static inline void proc_exec_connector(struct task_struct *task)
-{}
-
-static inline void proc_id_connector(struct task_struct *task,
-                                    int which_id)
-{}
-
-static inline void proc_exit_connector(struct task_struct *task)
-{}
-#endif /* CONFIG_PROC_EVENTS */
-#endif /* __KERNEL__ */
-#endif /* CN_PROC_H */
+#endif /* CN_PROC_H */