diff options
author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 13:56:19 -0400 |
commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /arch/um/kernel/exec.c | |
parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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" |