WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 3/8] 2.6.17: early_printk adjustments

To: <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH 3/8] 2.6.17: early_printk adjustments
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
Date: Wed, 14 Feb 2007 15:58:04 +0000
Delivery-date: Wed, 14 Feb 2007 07:56:26 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
This is a little more than a pure merge with 2.6.17, to remove a few
more non-Xen items.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2007-02-08/arch/x86_64/kernel/early_printk-xen.c
===================================================================
--- head-2007-02-08.orig/arch/x86_64/kernel/early_printk-xen.c  2007-02-08 
17:07:13.000000000 +0100
+++ head-2007-02-08/arch/x86_64/kernel/early_printk-xen.c       2007-02-08 
17:09:47.000000000 +0100
@@ -18,9 +18,8 @@
 #define VGABASE                ((void __iomem *)0xffffffff800b8000UL)
 #endif
 
-static int max_ypos = 25, max_xpos = 80;
-
 #ifndef CONFIG_XEN
+static int max_ypos = 25, max_xpos = 80;
 static int current_ypos = 25, current_xpos = 0; 
 
 static void early_vga_write(struct console *con, const char *str, unsigned n)
@@ -154,10 +153,6 @@ static __init void early_serial_init(cha
 
 #else /* CONFIG_XEN */
 
-#undef SCREEN_INFO
-#define SCREEN_INFO screen_info
-extern struct screen_info screen_info;
-
 static void
 early_serial_write(struct console *con, const char *s, unsigned count)
 {
@@ -273,11 +268,13 @@ int __init setup_early_printk(char *opt)
                early_serial_init(buf);
                early_console = &early_serial_console;
        } else if (!strncmp(buf, "vga", 3)
+#ifndef CONFIG_XEN
                   && SCREEN_INFO.orig_video_isVGA == 1) {
                max_xpos = SCREEN_INFO.orig_video_cols;
                max_ypos = SCREEN_INFO.orig_video_lines;
-#ifndef CONFIG_XEN
                current_ypos = SCREEN_INFO.orig_y;
+#else
+                  || !strncmp(buf, "xen", 3)) {
 #endif
                early_console = &early_vga_console;
        } else if (!strncmp(buf, "simnow", 6)) {



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH 3/8] 2.6.17: early_printk adjustments, Jan Beulich <=