# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 5aad88c8d37949e2348744cca0be4ce2865fa285
# Parent 3bbff714df11ecfe1c6fe82ab688827dcad8aecc
Remove xennull_con. Use dummy_con.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
diff -r 3bbff714df11 -r 5aad88c8d379
linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Feb 9 13:54:58 2006
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c Thu Feb 9 14:57:52 2006
@@ -1865,13 +1865,14 @@
#endif
#endif
} else {
- extern const struct consw xennull_con;
extern int console_use_vt;
#if defined(CONFIG_VGA_CONSOLE)
/* disable VGA driver */
ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
#endif
- conswitchp = &xennull_con;
+#if defined(CONFIG_DUMMY_CONSOLE)
+ conswitchp = &dummy_con;
+#endif
console_use_vt = 0;
}
}
diff -r 3bbff714df11 -r 5aad88c8d379
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 Thu Feb 9
13:54:58 2006
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c Thu Feb 9
14:57:52 2006
@@ -940,36 +940,37 @@
#endif
#ifdef CONFIG_XEN
- {
- physdev_op_t op;
-
- op.cmd = PHYSDEVOP_SET_IOPL;
- op.u.set_iopl.iopl = 1;
- HYPERVISOR_physdev_op(&op);
-
- if (xen_start_info->flags & SIF_INITDOMAIN) {
- if (!(xen_start_info->flags & SIF_PRIVILEGED))
- panic("Xen granted us console access "
- "but not privileged status");
+ {
+ physdev_op_t op;
+
+ op.cmd = PHYSDEVOP_SET_IOPL;
+ op.u.set_iopl.iopl = 1;
+ HYPERVISOR_physdev_op(&op);
+
+ if (xen_start_info->flags & SIF_INITDOMAIN) {
+ if (!(xen_start_info->flags & SIF_PRIVILEGED))
+ panic("Xen granted us console access "
+ "but not privileged status");
#ifdef CONFIG_VT
#if defined(CONFIG_VGA_CONSOLE)
- conswitchp = &vga_con;
+ conswitchp = &vga_con;
#elif defined(CONFIG_DUMMY_CONSOLE)
- conswitchp = &dummy_con;
-#endif
-#endif
- } else {
- extern const struct consw xennull_con;
- extern int console_use_vt;
+ conswitchp = &dummy_con;
+#endif
+#endif
+ } else {
+ extern int console_use_vt;
#if defined(CONFIG_VGA_CONSOLE)
- /* disable VGA driver */
- ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
-#endif
- conswitchp = &xennull_con;
- console_use_vt = 0;
- }
- }
+ /* disable VGA driver */
+ ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
+#endif
+#if defined(CONFIG_DUMMY_CONSOLE)
+ conswitchp = &dummy_con;
+#endif
+ console_use_vt = 0;
+ }
+ }
#else /* CONFIG_XEN */
#ifdef CONFIG_VT
diff -r 3bbff714df11 -r 5aad88c8d379
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Thu Feb 9
13:54:58 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Thu Feb 9
14:57:52 2006
@@ -562,45 +562,6 @@
.wait_until_sent = xencons_wait_until_sent,
};
-static const char *xennullcon_startup(void)
-{
- return NULL;
-}
-
-static int xennullcon_dummy(void)
-{
- return 0;
-}
-
-#define DUMMY (void *)xennullcon_dummy
-
-/*
- * The console `switch' structure for the dummy console
- *
- * Most of the operations are dummies.
- */
-
-const struct consw xennull_con = {
- .owner = THIS_MODULE,
- .con_startup = xennullcon_startup,
- .con_init = DUMMY,
- .con_deinit = DUMMY,
- .con_clear = DUMMY,
- .con_putc = DUMMY,
- .con_putcs = DUMMY,
- .con_cursor = DUMMY,
- .con_scroll = DUMMY,
- .con_bmove = DUMMY,
- .con_switch = DUMMY,
- .con_blank = DUMMY,
- .con_font_set = DUMMY,
- .con_font_get = DUMMY,
- .con_font_default = DUMMY,
- .con_font_copy = DUMMY,
- .con_set_palette = DUMMY,
- .con_scrolldelta = DUMMY,
-};
-
static int __init xencons_init(void)
{
int rc;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home