git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
acct.h
diff --git
a/include/linux/acct.h
b/include/linux/acct.h
index
a6ab17c
..
302eb72
100644
(file)
--- a/
include/linux/acct.h
+++ b/
include/linux/acct.h
@@
-16,6
+16,7
@@
#define _LINUX_ACCT_H
#include <linux/types.h>
#define _LINUX_ACCT_H
#include <linux/types.h>
+
#include <asm/param.h>
#include <asm/byteorder.h>
#include <asm/param.h>
#include <asm/byteorder.h>
@@
-114,15
+115,22
@@
struct acct_v3
#ifdef __KERNEL__
#ifdef __KERNEL__
-#include <linux/config.h>
#ifdef CONFIG_BSD_PROCESS_ACCT
#ifdef CONFIG_BSD_PROCESS_ACCT
+struct vfsmount;
struct super_block;
struct super_block;
+struct pacct_struct;
+extern void acct_auto_close_mnt(struct vfsmount *m);
extern void acct_auto_close(struct super_block *sb);
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);
#else
#else
+#define acct_auto_close_mnt(x) do { } while (0)
#define acct_auto_close(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)
#endif
/*
#endif
/*
@@
-156,15
+164,16
@@
typedef struct acct acct_t;
#endif /* __KERNEL */
#ifdef __KERNEL__
#endif /* __KERNEL */
#ifdef __KERNEL__
+#include <linux/jiffies.h>
/*
* Yet another set of HZ to *HZ helper functions.
/*
* Yet another set of HZ to *HZ helper functions.
- * See <linux/
tim
es.h> for the original.
+ * See <linux/
jiffi
es.h> for the original.
*/
static inline u32 jiffies_to_AHZ(unsigned long x)
{
#if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
*/
static inline u32 jiffies_to_AHZ(unsigned long x)
{
#if (TICK_NSEC % (NSEC_PER_SEC / AHZ)) == 0
- return x / (HZ /
USER_
HZ);
+ return x / (HZ /
A
HZ);
#else
u64 tmp = (u64)x * TICK_NSEC;
do_div(tmp, (NSEC_PER_SEC / AHZ));
#else
u64 tmp = (u64)x * TICK_NSEC;
do_div(tmp, (NSEC_PER_SEC / AHZ));