[Xen-ia64-devel] [PATCH] [CONSOLE] vga_con doesn't exist without CONFIG_VGA_CONSOLE

[Simon Horman <horms@xxxxxxxxxxxx>]

I'm not sure when this regression came in, but with my kernel setup I get
the following error on compile.  It seems farily trivial to fix by
rearanging the logic a little and guarding access to vga_con with #ifdef
CONFIG_VGA_CONSOLE

arch/ia64/kernel/built-in.o: In function
`setup_arch':arch/ia64/kernel/setup.c:616: undefined reference to `vga_con'
:arch/ia64/kernel/setup.c:616: undefined reference to `vga_con'

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>

Index: linux-2.6.18-xen.hg/arch/ia64/kernel/setup.c
===================================================================
--- linux-2.6.18-xen.hg.orig/arch/ia64/kernel/setup.c   2007-08-09 
09:44:52.000000000 +0900
+++ linux-2.6.18-xen.hg/arch/ia64/kernel/setup.c        2007-08-09 
09:50:58.000000000 +0900
@@ -613,10 +613,12 @@ setup_arch (char **cmdline_p)
                        int offset = 0;
 
                        memset(name, 0, sizeof(name));
-                       if (is_initial_xendomain() && conswitchp != &vga_con)
-                               strncpy(name, "ttyS", 4);
-                       else
+#if defined(CONFIG_VGA_CONSOLE)
+                       if (!is_initial_xendomain() || conswitchp == &vga_con)
                                strncpy(name, "tty", 3);
+                       else
+#endif
+                               strncpy(name, "ttyS", 4);
 
                        p = strstr(*cmdline_p, "xencons=");
 

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