X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=arch%2Fum%2Fkernel%2Fexec.c;h=8d56ec6cca79606e8ee8d075e455e1f2b8d532d6;hb=24ec839c431eb79bb8f6abc00c4e1eb3b8c4d517;hp=0561c43b4685c7935f4fb33600229a7c15793bf1;hpb=0cd43f83d381c4246a08cd775834833d6fd64805;p=powerpc.git

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 0561c43b46..8d56ec6cca 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -39,12 +39,13 @@ static long execve1(char *file, char __user * __user *argv,
 		    char __user *__user *env)
 {
         long error;
+	struct tty_struct *tty;
 
 #ifdef CONFIG_TTY_LOG
 	mutex_lock(&tty_mutex);
-	task_lock(current);	/* FIXME:  is this needed ? */
-	log_exec(argv, current->signal->tty);
-	task_unlock(current);
+	tty = get_current_tty();
+	if (tty)
+		log_exec(argv, tty);
 	mutex_unlock(&tty_mutex);
 #endif
         error = do_execve(file, argv, env, &current->thread.regs);