diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 19:30:58 -0400 |
| commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
| tree | fcf504879883763557e696eff81427b1ab78f76b /arch/um/kernel/exec.c | |
| parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
| parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
Merge branch 'ioat' into dmaengine
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" |