diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:30:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-04 21:30:44 -0800 |
| commit | 58a96a605ee4e5d573bec35c73bb6d015171cc16 (patch) | |
| tree | 52d49ddf2e58f38f457a1e50ffc7254cd8683783 /include/linux/acct.h | |
| parent | 55d411d0e475235b36343c10216657d96e9da156 (diff) | |
| parent | 05e7304908ec281ce4ef29d1db58ec8d6fd73563 (diff) | |
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/acct.h')
| -rw-r--r-- | include/linux/acct.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acct.h b/include/linux/acct.h index 39cd52f7f557..1993a3691768 100644 --- a/include/linux/acct.h +++ b/include/linux/acct.h @@ -120,12 +120,12 @@ struct acct_v3 struct super_block; extern void acct_auto_close(struct super_block *sb); extern void acct_process(long exitcode); -extern void acct_update_integrals(void); +extern void acct_update_integrals(struct task_struct *tsk); extern void acct_clear_integrals(struct task_struct *tsk); #else #define acct_auto_close(x) do { } while (0) #define acct_process(x) do { } while (0) -#define acct_update_integrals() do { } while (0) +#define acct_update_integrals(x) do { } while (0) #define acct_clear_integrals(task) do { } while (0) #endif |