[Xen-changelog] [linux-2.6.18-xen] xencons: Remove xencons_early_setup() and do not clear use_vt_console.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1189242172 -3600
# Node ID 52f308b17bae6ff0182342be87898ee2eb922eb1
# Parent  2a214d4ef5b175708d01ac5ce15de7745c48b756
xencons: Remove xencons_early_setup() and do not clear use_vt_console.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 arch/i386/kernel/setup-xen.c       |    2 --
 arch/ia64/kernel/setup.c           |    1 -
 arch/powerpc/platforms/xen/setup.c |    1 -
 arch/x86_64/kernel/setup-xen.c     |    1 -
 drivers/xen/console/console.c      |    6 ------
 include/xen/xencons.h              |    2 --
 6 files changed, 13 deletions(-)

diff -r 2a214d4ef5b1 -r 52f308b17bae arch/i386/kernel/setup-xen.c
--- a/arch/i386/kernel/setup-xen.c      Fri Sep 07 11:18:23 2007 +0100
+++ b/arch/i386/kernel/setup-xen.c      Sat Sep 08 10:02:52 2007 +0100
@@ -1897,8 +1897,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
        }
        tsc_init();
-
-       xencons_early_setup();
 }
 
 static int
diff -r 2a214d4ef5b1 -r 52f308b17bae arch/ia64/kernel/setup.c
--- a/arch/ia64/kernel/setup.c  Fri Sep 07 11:18:23 2007 +0100
+++ b/arch/ia64/kernel/setup.c  Sat Sep 08 10:02:52 2007 +0100
@@ -579,7 +579,6 @@ setup_arch (char **cmdline_p)
                                add_preferred_console(name, offset, NULL);
                }
        }
-       xencons_early_setup();
 #endif
 
 #ifdef CONFIG_VT
diff -r 2a214d4ef5b1 -r 52f308b17bae arch/powerpc/platforms/xen/setup.c
--- a/arch/powerpc/platforms/xen/setup.c        Fri Sep 07 11:18:23 2007 +0100
+++ b/arch/powerpc/platforms/xen/setup.c        Sat Sep 08 10:02:52 2007 +0100
@@ -164,7 +164,6 @@ static void __init xenppc_init_early(voi
 
        xen_setup_time(&mach_maple_md);
 
-       xencons_early_setup();
        add_preferred_console("xvc", 0, NULL);
 
        if (get_property(xen, "power-control", NULL))
diff -r 2a214d4ef5b1 -r 52f308b17bae arch/x86_64/kernel/setup-xen.c
--- a/arch/x86_64/kernel/setup-xen.c    Fri Sep 07 11:18:23 2007 +0100
+++ b/arch/x86_64/kernel/setup-xen.c    Sat Sep 08 10:02:52 2007 +0100
@@ -977,7 +977,6 @@ void __init setup_arch(char **cmdline_p)
 #endif
                 }
        }
-       xencons_early_setup();
 #else  /* CONFIG_XEN */
 
 #ifdef CONFIG_VT
diff -r 2a214d4ef5b1 -r 52f308b17bae drivers/xen/console/console.c
--- a/drivers/xen/console/console.c     Fri Sep 07 11:18:23 2007 +0100
+++ b/drivers/xen/console/console.c     Sat Sep 08 10:02:52 2007 +0100
@@ -85,12 +85,6 @@ extern int sysrq_enabled;
 extern int sysrq_enabled;
 #endif
 
-void xencons_early_setup(void)
-{
-       extern int console_use_vt;
-       console_use_vt = 0;
-}
-
 static int __init xencons_setup(char *str)
 {
        char *q;
diff -r 2a214d4ef5b1 -r 52f308b17bae include/xen/xencons.h
--- a/include/xen/xencons.h     Fri Sep 07 11:18:23 2007 +0100
+++ b/include/xen/xencons.h     Sat Sep 08 10:02:52 2007 +0100
@@ -14,6 +14,4 @@ int xencons_ring_init(void);
 int xencons_ring_init(void);
 int xencons_ring_send(const char *data, unsigned len);
 
-void xencons_early_setup(void);
-
 #endif /* __ASM_XENCONS_H__ */

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