diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-04-13 14:03:21 -0400 |
| commit | 4facdaec1ce186e731e6baa04f074804849e9a49 (patch) | |
| tree | e521fba8386bf23533cfe21ea5200e615960ec07 /arch/um/kernel/exec.c | |
| parent | a11cdaa7af56423a921a8bdad8f5a5f4ddca918a (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' into for-2.6.35
Conflicts:
block/blk-cgroup.c
block/cfq-iosched.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/um/kernel/exec.c')
| -rw-r--r-- | arch/um/kernel/exec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index fda30d21fb90..97974c1bdd12 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "linux/smp_lock.h" | 8 | #include "linux/smp_lock.h" |
| 9 | #include "linux/ptrace.h" | 9 | #include "linux/ptrace.h" |
| 10 | #include "linux/sched.h" | 10 | #include "linux/sched.h" |
| 11 | #include "linux/slab.h" | ||
| 11 | #include "asm/current.h" | 12 | #include "asm/current.h" |
| 12 | #include "asm/processor.h" | 13 | #include "asm/processor.h" |
| 13 | #include "asm/uaccess.h" | 14 | #include "asm/uaccess.h" |