Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / char / vt.c

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 521b6fb..b6da553 100644 (file)
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -1865,7 +1865,6 @@ static void do_con_trol(struct tty_struct *tty, unsigned int currcons, int c)
  * kernel memory allocation is available.
  */
 char con_buf[PAGE_SIZE];
-#define CON_BUF_SIZE   PAGE_SIZE
 DECLARE_MUTEX(con_buf_sem);
 
 /* acquires console_sem */
@@ -2499,7 +2498,7 @@ static void con_close(struct tty_struct *tty, struct file *filp)
                vt = tty->driver_data;
                if (vt)
                        vc_cons[vt->vc_num].d->vc_tty = NULL;
-               tty->driver_data = 0;
+               tty->driver_data = NULL;
                release_console_sem();
                vcs_remove_devfs(tty);
                up(&tty_sem);
@@ -2712,6 +2711,10 @@ int take_over_console(const struct consw *csw, int first, int last, int deflt)
                        save_screen(i);
                old_was_color = vc_cons[i].d->vc_can_do_color;
                vc_cons[i].d->vc_sw->con_deinit(vc_cons[i].d);
+               origin = (unsigned long) screenbuf;
+               visible_origin = origin;
+               scr_end = origin + screenbuf_size;
+               pos = origin + video_size_row*y + 2*x;
                visual_init(i, 0);
                update_attr(i);