From d9e0fcf456307b76b37f959b802e74a69c5e3178 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 7 Oct 2007 16:02:55 -0700
Subject: [PATCH] --- yaml --- r: 65304 b: refs/heads/master c:
 70cb97935b8859f27296772885104b599f560576 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/char/vt_ioctl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce482a922b93..6d1a39c53fd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8b28a65d81a6fdf58ef81ce5b8ac7a35304e68
+refs/heads/master: 70cb97935b8859f27296772885104b599f560576
diff --git a/trunk/drivers/char/vt_ioctl.c b/trunk/drivers/char/vt_ioctl.c
index c799b7f7bbb3..7a61a2a9aafe 100644
--- a/trunk/drivers/char/vt_ioctl.c
+++ b/trunk/drivers/char/vt_ioctl.c
@@ -1032,7 +1032,7 @@ static DECLARE_WAIT_QUEUE_HEAD(vt_activate_queue);
 
 /*
  * Sleeps until a vt is activated, or the task is interrupted. Returns
- * 0 if activation, -EINTR if interrupted.
+ * 0 if activation, -EINTR if interrupted by a signal handler.
  */
 int vt_waitactive(int vt)
 {
@@ -1057,7 +1057,7 @@ int vt_waitactive(int vt)
 			break;
 		}
 		release_console_sem();
-		retval = -EINTR;
+		retval = -ERESTARTNOHAND;
 		if (signal_pending(current))
 			break;
 		schedule();