diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/acct.h | 4 | ||||
-rw-r--r-- | include/linux/sched.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h index 3d54fbcf969e..5bca9b3ef2d7 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h | |||
@@ -121,12 +121,16 @@ struct vfsmount; | |||
121 | struct super_block; | 121 | struct super_block; |
122 | extern void acct_auto_close_mnt(struct vfsmount *m); | 122 | extern void acct_auto_close_mnt(struct vfsmount *m); |
123 | extern void acct_auto_close(struct super_block *sb); | 123 | extern void acct_auto_close(struct super_block *sb); |
124 | extern void acct_init_pacct(struct pacct_struct *pacct); | ||
125 | extern void acct_collect(); | ||
124 | extern void acct_process(long exitcode); | 126 | extern void acct_process(long exitcode); |
125 | extern void acct_update_integrals(struct task_struct *tsk); | 127 | extern void acct_update_integrals(struct task_struct *tsk); |
126 | extern void acct_clear_integrals(struct task_struct *tsk); | 128 | extern void acct_clear_integrals(struct task_struct *tsk); |
127 | #else | 129 | #else |
128 | #define acct_auto_close_mnt(x) do { } while (0) | 130 | #define acct_auto_close_mnt(x) do { } while (0) |
129 | #define acct_auto_close(x) do { } while (0) | 131 | #define acct_auto_close(x) do { } while (0) |
132 | #define acct_init_pacct(x) do { } while (0) | ||
133 | #define acct_collect() do { } while (0) | ||
130 | #define acct_process(x) do { } while (0) | 134 | #define acct_process(x) do { } while (0) |
131 | #define acct_update_integrals(x) do { } while (0) | 135 | #define acct_update_integrals(x) do { } while (0) |
132 | #define acct_clear_integrals(task) do { } while (0) | 136 | #define acct_clear_integrals(task) do { } while (0) |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 38b4791e6a5d..abada7c1d5e4 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -358,6 +358,10 @@ struct sighand_struct { | |||
358 | spinlock_t siglock; | 358 | spinlock_t siglock; |
359 | }; | 359 | }; |
360 | 360 | ||
361 | struct pacct_struct { | ||
362 | unsigned long ac_mem; | ||
363 | }; | ||
364 | |||
361 | /* | 365 | /* |
362 | * NOTE! "signal_struct" does not have it's own | 366 | * NOTE! "signal_struct" does not have it's own |
363 | * locking, because a shared signal_struct always | 367 | * locking, because a shared signal_struct always |
@@ -449,6 +453,9 @@ struct signal_struct { | |||
449 | struct key *session_keyring; /* keyring inherited over fork */ | 453 | struct key *session_keyring; /* keyring inherited over fork */ |
450 | struct key *process_keyring; /* keyring private to this process */ | 454 | struct key *process_keyring; /* keyring private to this process */ |
451 | #endif | 455 | #endif |
456 | #ifdef CONFIG_BSD_PROCESS_ACCT | ||
457 | struct pacct_struct pacct; /* per-process accounting information */ | ||
458 | #endif | ||
452 | }; | 459 | }; |
453 | 460 | ||
454 | /* Context switch must be unlocked if interrupts are to be enabled */ | 461 | /* Context switch must be unlocked if interrupts are to be enabled */ |