diff options
Diffstat (limited to 'arch/um/kernel/exec.c')
-rw-r--r-- | arch/um/kernel/exec.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index f5d7f4569ba7..fda30d21fb90 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include "mem_user.h" | 15 | #include "mem_user.h" |
16 | #include "skas.h" | 16 | #include "skas.h" |
17 | #include "os.h" | 17 | #include "os.h" |
18 | #include "internal.h" | ||
18 | 19 | ||
19 | void flush_thread(void) | 20 | void flush_thread(void) |
20 | { | 21 | { |
@@ -42,23 +43,11 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) | |||
42 | PT_REGS_SP(regs) = esp; | 43 | PT_REGS_SP(regs) = esp; |
43 | } | 44 | } |
44 | 45 | ||
45 | #ifdef CONFIG_TTY_LOG | ||
46 | extern void log_exec(char **argv, void *tty); | ||
47 | #endif | ||
48 | |||
49 | static long execve1(char *file, char __user * __user *argv, | 46 | static long execve1(char *file, char __user * __user *argv, |
50 | char __user *__user *env) | 47 | char __user *__user *env) |
51 | { | 48 | { |
52 | long error; | 49 | long error; |
53 | #ifdef CONFIG_TTY_LOG | ||
54 | struct tty_struct *tty; | ||
55 | 50 | ||
56 | mutex_lock(&tty_mutex); | ||
57 | tty = get_current_tty(); | ||
58 | if (tty) | ||
59 | log_exec(argv, tty); | ||
60 | mutex_unlock(&tty_mutex); | ||
61 | #endif | ||
62 | error = do_execve(file, argv, env, ¤t->thread.regs); | 51 | error = do_execve(file, argv, env, ¤t->thread.regs); |
63 | if (error == 0) { | 52 | if (error == 0) { |
64 | task_lock(current); | 53 | task_lock(current); |