[Xen-changelog] Fix x86_64 guest console support.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 87a83b44930b3d313bde9b69c7797e3add2ccc71
# Parent  55268b90a51993d86d116d7bd03d23ae8fe63f17
Fix x86_64 guest console support.

Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r 55268b90a519 -r 87a83b44930b 
linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c       Tue Feb  7 
00:02:49 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c       Tue Feb  7 
11:54:09 2006
@@ -951,22 +951,20 @@
                       
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
-              conswitchp = &vga_con;
+                      conswitchp = &vga_con;
 #elif defined(CONFIG_DUMMY_CONSOLE)
-              conswitchp = &dummy_con;
+                      conswitchp = &dummy_con;
 #endif
 #endif
               } else {
-#ifdef CONFIG_XEN_PRIVILEGED_GUEST
                       extern const struct consw xennull_con;
                       extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)
-               /* disable VGA driver */
+                      /* disable VGA driver */
                       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
 #endif
                       conswitchp = &xennull_con;
                       console_use_vt = 0;
-#endif
               }
        }
 #else  /* CONFIG_XEN */

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