Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / arch / um / kernel / exec.c

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 8d56ec6..1211664 100644 (file)
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -39,9 +39,9 @@ static long execve1(char *file, char __user * __user *argv,
                    char __user *__user *env)
 {
         long error;
+#ifdef CONFIG_TTY_LOG
        struct tty_struct *tty;
 
-#ifdef CONFIG_TTY_LOG
        mutex_lock(&tty_mutex);
        tty = get_current_tty();
        if (tty)