Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / include / linux / acct.h

diff --git a/include/linux/acct.h b/include/linux/acct.h
index 93c5b3c..e86bae7 100644 (file)
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -16,6 +16,7 @@
 #define _LINUX_ACCT_H
 
 #include <linux/types.h>
+
 #include <asm/param.h>
 #include <asm/byteorder.h>
 
@@ -114,20 +115,23 @@ struct acct_v3
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
 
 #ifdef CONFIG_BSD_PROCESS_ACCT
 struct vfsmount;
 struct super_block;
 extern void acct_auto_close_mnt(struct vfsmount *m);
 extern void acct_auto_close(struct super_block *sb);
-extern void acct_process(long exitcode);
+extern void acct_init_pacct(struct pacct_struct *pacct);
+extern void acct_collect(long exitcode, int group_dead);
+extern void acct_process(void);
 extern void acct_update_integrals(struct task_struct *tsk);
 extern void acct_clear_integrals(struct task_struct *tsk);
 #else
 #define acct_auto_close_mnt(x) do { } while (0)
 #define acct_auto_close(x)     do { } while (0)
-#define acct_process(x)                do { } while (0)
+#define acct_init_pacct(x)     do { } while (0)
+#define acct_collect(x,y)      do { } while (0)
+#define acct_process()         do { } while (0)
 #define acct_update_integrals(x)               do { } while (0)
 #define acct_clear_integrals(task)     do { } while (0)
 #endif
@@ -163,6 +167,7 @@ typedef struct acct acct_t;
 #endif /* __KERNEL */
 
 #ifdef __KERNEL__
+#include <linux/jiffies.h>
 /*
  * Yet another set of HZ to *HZ helper functions.
  * See <linux/jiffies.h> for the original.