From 22ab757c03cf55fbfebe5ff92a8a7f9cc4937a83 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Fri, 23 Jun 2006 02:05:52 -0700
Subject: [PATCH] --- yaml --- r: 29072 b: refs/heads/master c:
 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/Documentation/DocBook/kernel-api.tmpl | 12 ++++++++++++
 trunk/kernel/auditsc.c                      |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 511e20457759..0a5a58680f94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d83015b8f62ee3fcd338f6f009051ed57f77a531
+refs/heads/master: 862f5f0133f1c8a179dd93adc03d43f8f7e8bac5
diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
index 6dab3dd36995..31b727ceb127 100644
--- a/trunk/Documentation/DocBook/kernel-api.tmpl
+++ b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -332,6 +332,18 @@ X!Earch/i386/kernel/mca.c
 !Esecurity/security.c
   </chapter>
 
+  <chapter id="audit">
+     <title>Audit Interfaces</title>
+!Ekernel/audit.c
+!Ikernel/auditsc.c
+!Ikernel/auditfilter.c
+  </chapter>
+
+  <chapter id="accounting">
+     <title>Accounting Framework</title>
+!Ikernel/acct.c
+  </chapter>
+
   <chapter id="pmfuncs">
      <title>Power Management</title>
 !Ekernel/power/pm.c
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
index b097ccb4eb7e..9ebd96fda295 100644
--- a/trunk/kernel/auditsc.c
+++ b/trunk/kernel/auditsc.c
@@ -1558,6 +1558,7 @@ 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.
  */