diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-09 02:17:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-03-09 02:17:32 -0500 |
| commit | ce67eef6a112bb283c6db39f9195800f31f5599a (patch) | |
| tree | 34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /kernel/tsacct.c | |
| parent | 776943fd6f104a6e8457dc95a17282e69e963666 (diff) | |
| parent | 57d54889cd00db2752994b389ba714138652e60c (diff) | |
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'kernel/tsacct.c')
| -rw-r--r-- | kernel/tsacct.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/tsacct.c b/kernel/tsacct.c index 00d59d048edf..0a67e041edf8 100644 --- a/kernel/tsacct.c +++ b/kernel/tsacct.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/tsacct_kern.h> | 21 | #include <linux/tsacct_kern.h> |
| 22 | #include <linux/acct.h> | 22 | #include <linux/acct.h> |
| 23 | #include <linux/jiffies.h> | 23 | #include <linux/jiffies.h> |
| 24 | #include <linux/mm.h> | ||
| 24 | 25 | ||
| 25 | /* | 26 | /* |
| 26 | * fill in basic accounting fields | 27 | * fill in basic accounting fields |