aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-06-23 05:05:52 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:07 -0400
commit862f5f0133f1c8a179dd93adc03d43f8f7e8bac5 (patch)
tree51ef137f4a648859c339988413a19ab3567c032e
parentd83015b8f62ee3fcd338f6f009051ed57f77a531 (diff)
[PATCH] Doc: add audit & acct to DocBook
Fix one audit kernel-doc description (one parameter was missing). Add audit*.c interfaces to DocBook. Add BSD accounting interfaces to DocBook. Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/DocBook/kernel-api.tmpl12
-rw-r--r--kernel/auditsc.c1
2 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 6dab3dd36995..31b727ceb127 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -332,6 +332,18 @@ X!Earch/i386/kernel/mca.c
332!Esecurity/security.c 332!Esecurity/security.c
333 </chapter> 333 </chapter>
334 334
335 <chapter id="audit">
336 <title>Audit Interfaces</title>
337!Ekernel/audit.c
338!Ikernel/auditsc.c
339!Ikernel/auditfilter.c
340 </chapter>
341
342 <chapter id="accounting">
343 <title>Accounting Framework</title>
344!Ikernel/acct.c
345 </chapter>
346
335 <chapter id="pmfuncs"> 347 <chapter id="pmfuncs">
336 <title>Power Management</title> 348 <title>Power Management</title>
337!Ekernel/power/pm.c 349!Ekernel/power/pm.c
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index b097ccb4eb7e..9ebd96fda295 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1558,6 +1558,7 @@ int __audit_ipc_obj(struct kern_ipc_perm *ipcp)
1558 * @uid: msgq user id 1558 * @uid: msgq user id
1559 * @gid: msgq group id 1559 * @gid: msgq group id
1560 * @mode: msgq mode (permissions) 1560 * @mode: msgq mode (permissions)
1561 * @ipcp: in-kernel IPC permissions
1561 * 1562 *
1562 * Returns 0 for success or NULL context or < 0 on error. 1563 * Returns 0 for success or NULL context or < 0 on error.
1563 */ 1564 */