---

yaml --- r: 30755 b: refs/heads/master c: 1dbe83c h: refs/heads/master i: 30753: 70d5ae5 30751: 296c98b v: v3
git-mirror · Jun 28, 2006 · eafedc4 · eafedc4
1 parent 9f3fce1
commit eafedc4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 283fef59d6e934e8da11631446ea8e2e93fce14c
+refs/heads/master: 1dbe83c3445a1604546620a60888cf26b63f8782
diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c
@@ -521,6 +521,7 @@ static void do_acct_process(struct file *file)
 
 /**
  * acct_init_pacct - initialize a new pacct_struct
+ * @pacct: per-process accounting info struct to initialize
  */
 void acct_init_pacct(struct pacct_struct *pacct)
 {

diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
@@ -1367,7 +1367,7 @@ int __audit_mq_open(int oflag, mode_t mode, struct mq_attr __user *u_attr)
  * @mqdes: MQ descriptor
  * @msg_len: Message length
  * @msg_prio: Message priority
- * @abs_timeout: Message timeout in absolute time
+ * @u_abs_timeout: Message timeout in absolute time
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
@@ -1409,8 +1409,8 @@ int __audit_mq_timedsend(mqd_t mqdes, size_t msg_len, unsigned int msg_prio,
  * __audit_mq_timedreceive - record audit data for a POSIX MQ timed receive
  * @mqdes: MQ descriptor
  * @msg_len: Message length
- * @msg_prio: Message priority
- * @abs_timeout: Message timeout in absolute time
+ * @u_msg_prio: Message priority
+ * @u_abs_timeout: Message timeout in absolute time
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
@@ -1558,7 +1558,6 @@ int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
  * @uid: msgq user id
  * @gid: msgq group id
  * @mode: msgq mode (permissions)
- * @ipcp: in-kernel IPC permissions
  *
  * Returns 0 for success or NULL context or < 0 on error.
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -521,6 +521,7 @@ static void do_acct_process(struct file *file) @@
     /**
      * acct_init_pacct - initialize a new pacct_struct
+     * @pacct: per-process accounting info struct to initialize
      */
     void acct_init_pacct(struct pacct_struct *pacct)
     {
@@ Expand Down @@