X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fum%2Fkernel%2Fexec.c;h=8d56ec6cca79606e8ee8d075e455e1f2b8d532d6;hb=7172c64a7cee4dfa95864f49c914f7ea8cf497c8;hp=fc38a6d5906d4251599a95753f229486eae2cb4e;hpb=3967a72a825e44bff5d10f516e90b6f59f59e599;p=linux-2.6.git

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index fc38a6d59..8d56ec6cc 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -39,11 +39,14 @@ static long execve1(char *file, char __user * __user *argv,
 		    char __user *__user *env)
 {
         long error;
+	struct tty_struct *tty;
 
 #ifdef CONFIG_TTY_LOG
-	task_lock(current);
-	log_exec(argv, current->signal->tty);
-	task_unlock(current);
+	mutex_lock(&tty_mutex);
+	tty = get_current_tty();
+	if (tty)
+		log_exec(argv, tty);
+	mutex_unlock(&tty_mutex);
 #endif
         error = do_execve(file, argv, env, &current->thread.regs);
         if (error == 0){