diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/um/kernel/exec.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/um/kernel/exec.c')
| -rw-r--r-- | arch/um/kernel/exec.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 49b5e1eb3262..09bd7b585726 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include "linux/stddef.h" | 6 | #include "linux/stddef.h" |
| 7 | #include "linux/fs.h" | 7 | #include "linux/fs.h" |
| 8 | #include "linux/smp_lock.h" | ||
| 9 | #include "linux/ptrace.h" | 8 | #include "linux/ptrace.h" |
| 10 | #include "linux/sched.h" | 9 | #include "linux/sched.h" |
| 11 | #include "linux/slab.h" | 10 | #include "linux/slab.h" |
| @@ -78,13 +77,11 @@ long sys_execve(const char __user *file, const char __user *const __user *argv, | |||
| 78 | long error; | 77 | long error; |
| 79 | char *filename; | 78 | char *filename; |
| 80 | 79 | ||
| 81 | lock_kernel(); | ||
| 82 | filename = getname(file); | 80 | filename = getname(file); |
| 83 | error = PTR_ERR(filename); | 81 | error = PTR_ERR(filename); |
| 84 | if (IS_ERR(filename)) goto out; | 82 | if (IS_ERR(filename)) goto out; |
| 85 | error = execve1(filename, argv, env); | 83 | error = execve1(filename, argv, env); |
| 86 | putname(filename); | 84 | putname(filename); |
| 87 | out: | 85 | out: |
| 88 | unlock_kernel(); | ||
| 89 | return error; | 86 | return error; |
| 90 | } | 87 | } |