From cf1c381a5afd1e688fe294bf5bbf13af79151ba5 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Mon, 25 Sep 2006 23:33:08 -0700
Subject: [PATCH] --- yaml --- r: 35708 b: refs/heads/master c:
 b1fc0b1f21c4082d24d1f456a846b4fa7d16a70b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/um/kernel/exec.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 240f2f5527b1..1ceadc985dd9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e29b18d9a46bf3193278e92dc95609a8cca2ab
+refs/heads/master: b1fc0b1f21c4082d24d1f456a846b4fa7d16a70b
diff --git a/trunk/arch/um/kernel/exec.c b/trunk/arch/um/kernel/exec.c
index fc38a6d5906d..0561c43b4685 100644
--- a/trunk/arch/um/kernel/exec.c
+++ b/trunk/arch/um/kernel/exec.c
@@ -41,9 +41,11 @@ static long execve1(char *file, char __user * __user *argv,
         long error;
 
 #ifdef CONFIG_TTY_LOG
-	task_lock(current);
+	mutex_lock(&tty_mutex);
+	task_lock(current);	/* FIXME:  is this needed ? */
 	log_exec(argv, current->signal->tty);
 	task_unlock(current);
+	mutex_unlock(&tty_mutex);
 #endif
         error = do_execve(file, argv, env, &current->thread.regs);
         if (error == 0){