---

yaml
---
r: 43491
b: refs/heads/master
c: 24ec839
h: refs/heads/master
i:
  43489: 8f88b93
  43487: 449134b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 562f9c574e0707f9159a729ea41faf53b221cd30
+refs/heads/master: 24ec839c431eb79bb8f6abc00c4e1eb3b8c4d517

trunk/arch/sparc64/solaris/misc.c

@@ -423,9 +423,7 @@ asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid)
 			   Solaris setpgrp and setsid? */
 			ret = sys_setpgid(0, 0);
 			if (ret) return ret;
-			mutex_lock(&tty_mutex);
-			current->signal->tty = NULL;
-			mutex_unlock(&tty_mutex);
+			proc_clear_tty(current);
 			return process_group(current);
 		}
 	case 2: /* getsid */

trunk/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);