string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / include / linux / cn_proc.h

diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index c948f67..47dac5e 100644 (file)
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -3,30 +3,22 @@
  *
  * Copyright (C) Matt Helsley, IBM Corp. 2005
  * Based on cn_fork.h by Nguyen Anh Quynh and Guillaume Thouvenin
- * Original copyright notice follows:
  * Copyright (C) 2005 Nguyen Anh Quynh <aquynh@gmail.com>
  * Copyright (C) 2005 Guillaume Thouvenin <guillaume.thouvenin@bull.net>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2.1 of the GNU Lesser General Public License
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 #ifndef CN_PROC_H
 #define CN_PROC_H
 
 #include <linux/types.h>
-#include <linux/connector.h>
 
 /*
  * Userspace sends this enum to register with the kernel that it is listening
@@ -60,31 +52,34 @@ struct proc_event {
                PROC_EVENT_EXEC = 0x00000002,
                PROC_EVENT_UID  = 0x00000004,
                PROC_EVENT_GID  = 0x00000040,
+               PROC_EVENT_SID  = 0x00000080,
                /* "next" should be 0x00000400 */
                /* "last" is the last process event: exit */
                PROC_EVENT_EXIT = 0x80000000
        } what;
        __u32 cpu;
+       __u64 __attribute__((aligned(8))) timestamp_ns;
+               /* Number of nano seconds since system boot */
        union { /* must be last field of proc_event struct */
                struct {
                        __u32 err;
                } 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 */
@@ -95,9 +90,14 @@ struct proc_event {
                        } e;
                } id;
 
+               struct sid_proc_event {
+                       __kernel_pid_t process_pid;
+                       __kernel_pid_t process_tgid;
+               } sid;
+
                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;
@@ -108,6 +108,7 @@ struct proc_event {
 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_sid_connector(struct task_struct *task);
 void proc_exit_connector(struct task_struct *task);
 #else
 static inline void proc_fork_connector(struct task_struct *task)
@@ -120,6 +121,9 @@ static inline void proc_id_connector(struct task_struct *task,
                                     int which_id)
 {}
 
+static inline void proc_sid_connector(struct task_struct *task)
+{}
+
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif /* CONFIG_PROC_EVENTS */