[Xen-ia64-devel] [patch] remove xenconsole.c

[Aron Griffis <aron@xxxxxx>]

There's no declaration for early_console_setup(), defined in
xenconsole.c and used in setup.c.  This generates a warning which
becomes an error when built with
-Werror-implicit-function-declaration, as in the Fedora kernel rpm.

Rather than bother with a prototype, inline the snippet of code and
get rid of xenconsole.c completely.

Signed-off-by: Aron Griffis <aron@xxxxxx>

# HG changeset patch
# User agriffis@xxxxxxxxxxxxxxxxx
# Node ID 3c7b9ee13a4419f2582eabb90030a762ea4b7153
# Parent  fca97f3ab031ad8a6547c66a3beb67225061a578
Inline the content of early_console_setup() to setup.c and remove
xenconsole.c

diff -r fca97f3ab031 -r 3c7b9ee13a44 
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Tue May 30 10:32:42 
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c     Wed May 31 16:20:19 
2006 -0400
@@ -347,8 +347,14 @@ early_console_setup (char *cmdline)
        int earlycons = 0;
 
 #ifdef CONFIG_XEN
-       if (!early_xen_console_setup(cmdline))
+#ifndef CONFIG_IA64_HP_SIM
+       if (is_running_on_xen()) {
+               extern struct console hpsim_cons;
+               hpsim_cons.flags |= CON_BOOT;
+               register_console(&hpsim_cons);
                earlycons++;
+       }
+#endif
 #endif
 #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
        {
diff -r fca97f3ab031 -r 3c7b9ee13a44 linux-2.6-xen-sparse/arch/ia64/xen/Makefile
--- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile       Tue May 30 10:32:42 
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile       Wed May 31 16:20:19 
2006 -0400
@@ -2,7 +2,7 @@
 # Makefile for Xen components
 #
 
-obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o 
xenconsole.o
+obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o
 
 obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o util.o
 pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o
diff -r fca97f3ab031 -r 3c7b9ee13a44 
linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c   Tue May 30 10:32:42 
2006 -0600
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#include <linux/config.h>
-#include <linux/console.h>
-#include <asm/hypervisor.h>
-
-int
-early_xen_console_setup (char *cmdline)
-{
-#ifdef CONFIG_XEN
-#ifndef CONFIG_IA64_HP_SIM
-       if (is_running_on_xen()) {
-               extern struct console hpsim_cons;
-               hpsim_cons.flags |= CON_BOOT;
-               register_console(&hpsim_cons);
-               return 0;
-       }
-#endif
-#endif
-       return -1;
-}

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