diff options
Diffstat (limited to 'arch/um/kernel/exec.c')
-rw-r--r-- | arch/um/kernel/exec.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index de66c421ae9d..ab019c7f0b57 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
@@ -16,7 +16,6 @@ | |||
16 | #include <mem_user.h> | 16 | #include <mem_user.h> |
17 | #include <skas.h> | 17 | #include <skas.h> |
18 | #include <os.h> | 18 | #include <os.h> |
19 | #include "internal.h" | ||
20 | 19 | ||
21 | void flush_thread(void) | 20 | void flush_thread(void) |
22 | { | 21 | { |
@@ -49,27 +48,7 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) | |||
49 | } | 48 | } |
50 | EXPORT_SYMBOL(start_thread); | 49 | EXPORT_SYMBOL(start_thread); |
51 | 50 | ||
52 | long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env) | 51 | void __noreturn ret_from_kernel_execve(struct pt_regs *unused) |
53 | { | 52 | { |
54 | long err; | 53 | UML_LONGJMP(current->thread.exec_buf, 1); |
55 | |||
56 | err = do_execve(file, argv, env, ¤t->thread.regs); | ||
57 | if (!err) | ||
58 | UML_LONGJMP(current->thread.exec_buf, 1); | ||
59 | return err; | ||
60 | } | ||
61 | |||
62 | long sys_execve(const char __user *file, const char __user *const __user *argv, | ||
63 | const char __user *const __user *env) | ||
64 | { | ||
65 | long error; | ||
66 | char *filename; | ||
67 | |||
68 | filename = getname(file); | ||
69 | error = PTR_ERR(filename); | ||
70 | if (IS_ERR(filename)) goto out; | ||
71 | error = do_execve(filename, argv, env, ¤t->thread.regs); | ||
72 | putname(filename); | ||
73 | out: | ||
74 | return error; | ||
75 | } | 54 | } |