vserver 2.0 rc7

[linux-2.6.git] / drivers / video / console / vgacon.c

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index fb5d594..bcf59b2 100644 (file)
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -337,14 +337,16 @@ static void vgacon_init(struct vc_data *c, int init)
        c->vc_scan_lines = vga_scan_lines;
        c->vc_font.height = vga_video_font_height;
        c->vc_complement_mask = 0x7700;
+       if (vga_512_chars)
+               c->vc_hi_font_mask = 0x0800;
        p = *c->vc_uni_pagedir_loc;
        if (c->vc_uni_pagedir_loc == &c->vc_uni_pagedir ||
            !--c->vc_uni_pagedir_loc[1])
-               con_free_unimap(c->vc_num);
+               con_free_unimap(c);
        c->vc_uni_pagedir_loc = vgacon_uni_pagedir;
        vgacon_uni_pagedir[1]++;
        if (!vgacon_uni_pagedir[0] && p)
-               con_set_default_unimap(c->vc_num);
+               con_set_default_unimap(c);
 }
 
 static inline void vga_set_mem_top(struct vc_data *c)
@@ -358,10 +360,10 @@ static void vgacon_deinit(struct vc_data *c)
        if (!--vgacon_uni_pagedir[1]) {
                c->vc_visible_origin = vga_vram_base;
                vga_set_mem_top(c);
-               con_free_unimap(c->vc_num);
+               con_free_unimap(c);
        }
        c->vc_uni_pagedir_loc = &c->vc_uni_pagedir;
-       con_set_default_unimap(c->vc_num);
+       con_set_default_unimap(c);
 }
 
 static u8 vgacon_build_attr(struct vc_data *c, u8 color, u8 intensity,
@@ -908,7 +910,7 @@ static int vgacon_adjust_height(struct vc_data *vc, unsigned fontheight)
                                c->vc_sw->con_cursor(c, CM_DRAW);
                        }
                        c->vc_font.height = fontheight;
-                       vc_resize(c->vc_num, 0, rows);  /* Adjust console size */
+                       vc_resize(c, 0, rows);  /* Adjust console size */
                }
        }
        return 0;