Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[~andy/linux] / include / linux / acct.h

diff --git a/include/linux/acct.h b/include/linux/acct.h
index 5bca9b3ef2d71949034c98874a4c55a423016e85..0496d1f0995212b4c8ae873ac5e7159fcab318cb 100644 (file)
--- a/include/linux/acct.h
+++ b/include/linux/acct.h
@@ -122,18 +122,14 @@ struct super_block;
 extern void acct_auto_close_mnt(struct vfsmount *m);
 extern void acct_auto_close(struct super_block *sb);
 extern void acct_init_pacct(struct pacct_struct *pacct);
-extern void acct_collect();
-extern void acct_process(long exitcode);
-extern void acct_update_integrals(struct task_struct *tsk);
-extern void acct_clear_integrals(struct task_struct *tsk);
+extern void acct_collect(long exitcode, int group_dead);
+extern void acct_process(void);
 #else
 #define acct_auto_close_mnt(x) do { } while (0)
 #define acct_auto_close(x)     do { } while (0)
 #define acct_init_pacct(x)     do { } while (0)
-#define acct_collect()         do { } while (0)
-#define acct_process(x)                do { } while (0)
-#define acct_update_integrals(x)               do { } while (0)
-#define acct_clear_integrals(task)     do { } while (0)
+#define acct_collect(x,y)      do { } while (0)
+#define acct_process()         do { } while (0)
 #endif
 
 /*