[Xen-changelog] [linux-2.6.18-xen] [IA64] vga_con doesn't exist without CONFIG_VGA_CONSOLE

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1186942167 21600
# Node ID 26a45a66dedeac2f53e49b62ef18e3974ec56437
# Parent  dd415303b25f9f65c3dca0e6d7c385deaf47082d
[IA64] vga_con doesn't exist without CONFIG_VGA_CONSOLE

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---
 arch/ia64/kernel/setup.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff -r dd415303b25f -r 26a45a66dede arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c  Wed Aug 01 16:41:06 2007 -0600
+++ b/arch/ia64/kernel/setup.c  Sun Aug 12 12:09:27 2007 -0600
@@ -546,10 +546,12 @@ setup_arch (char **cmdline_p)
                        int offset = 0;
 
                        memset(name, 0, sizeof(name));
-                       if (is_initial_xendomain() && conswitchp != &vga_con)
+#if defined(CONFIG_VGA_CONSOLE)
+                       if (!is_initial_xendomain() || conswitchp == &vga_con)
+                               strncpy(name, "tty", 3);
+                       else
+#endif
                                strncpy(name, "ttyS", 4);
-                       else
-                               strncpy(name, "tty", 3);
 
                        p = strstr(*cmdline_p, "xencons=");
 

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