---

yaml --- r: 114666 b: refs/heads/master c: 7c3b1dc h: refs/heads/master v: v3
git-mirror · Oct 15, 2008 · c776767 · c776767
1 parent 52fb6c0
commit c776767
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d54aaf389bb47f30fd6567b88665689967be642
+refs/heads/master: 7c3b1dcf13d5660152e02c6dea47b0bd9fd5d871
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
@@ -3032,11 +3032,12 @@ EXPORT_SYMBOL(tty_devnum);
 
 void proc_clear_tty(struct task_struct *p)
 {
+	unsigned long flags;
 	struct tty_struct *tty;
-	spin_lock_irq(&p->sighand->siglock);
+	spin_lock_irqsave(&p->sighand->siglock, flags);
 	tty = p->signal->tty;
 	p->signal->tty = NULL;
-	spin_unlock_irq(&p->sighand->siglock);
+	spin_unlock_irqrestore(&p->sighand->siglock, flags);
 	tty_kref_put(tty);
 }