diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-02 23:28:58 -0400 |
| commit | df2071bd081408318d659cd14a9cf6ff23d874c9 (patch) | |
| tree | b31291b5fd4b9f84c629833afbfaa8d431857475 /kernel/taskstats.c | |
| parent | 97e3d94aac1c3e95bd04d1b186479a4df3663ab8 (diff) | |
| parent | be1066bbcd443a65df312fdecea7e4959adedb45 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/taskstats.c')
| -rw-r--r-- | kernel/taskstats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/taskstats.c b/kernel/taskstats.c index 899ca51be5e8..11281d5792bd 100644 --- a/kernel/taskstats.c +++ b/kernel/taskstats.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/delayacct.h> | 22 | #include <linux/delayacct.h> |
| 23 | #include <linux/cpumask.h> | 23 | #include <linux/cpumask.h> |
| 24 | #include <linux/percpu.h> | 24 | #include <linux/percpu.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/cgroupstats.h> | 26 | #include <linux/cgroupstats.h> |
| 26 | #include <linux/cgroup.h> | 27 | #include <linux/cgroup.h> |
| 27 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |