diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/um/kernel/exec.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
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" |