1 files changed, 26 insertions, 2 deletions

diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index dc8368ebb1ac..3a5d301e783b 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -672,7 +672,8 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                 vc->vt_mode = tmp;
                 /* the frsig is ignored, so we set it to 0 */
                 vc->vt_mode.frsig = 0;
-                put_pid(xchg(&vc->vt_pid, get_pid(task_pid(current))));
+                put_pid(vc->vt_pid);
+                vc->vt_pid = get_pid(task_pid(current));
                 /* no switch is required -- saw@shade.msu.ru */
                 vc->vt_newvt = -1;
                 release_console_sem();
@@ -1063,12 +1064,35 @@ void reset_vc(struct vc_data *vc)
         vc->vt_mode.relsig = 0;
         vc->vt_mode.acqsig = 0;
         vc->vt_mode.frsig = 0;
-        put_pid(xchg(&vc->vt_pid, NULL));
+        put_pid(vc->vt_pid);
+        vc->vt_pid = NULL;
         vc->vt_newvt = -1;
         if (!in_interrupt())    /* Via keyboard.c:SAK() - akpm */
                 reset_palette(vc);
 }
 
+void vc_SAK(struct work_struct *work)
+{
+        struct vc *vc_con =
+                container_of(work, struct vc, SAK_work);
+        struct vc_data *vc;
+        struct tty_struct *tty;
+
+        acquire_console_sem();
+        vc = vc_con->d;
+        if (vc) {
+                tty = vc->vc_tty;
+                /*
+                 * SAK should also work in all raw modes and reset
+                 * them properly.
+                 */
+                if (tty)
+                        __do_SAK(tty);
+                reset_vc(vc);
+        }
+        release_console_sem();
+}
+
 /*
  * Performs the back end of a vt switch
  */