Mailing List Archive

# HG changeset patch
# User awilliam@xenbuild.aw
# Node ID 671e8bd80d9a734137970c579bcce4f368f91ed2
# Parent acabf4bdec4fb4cca056f4c80deaab32e9f1b767
[IA64] remove linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c

Inline the content of early_console_setup() to setup.c and remove
xenconsole.c

Signed-off-by: Aron Griffis <aron@hp.com>
---
linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c | 19 -------------------
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 8 +++++++-
linux-2.6-xen-sparse/arch/ia64/xen/Makefile | 2 +-
3 files changed, 8 insertions(+), 21 deletions(-)

diff -r acabf4bdec4f -r 671e8bd80d9a linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Wed May 31 13:05:21 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Wed May 31 14:34:33 2006 -0600
@@ -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 acabf4bdec4f -r 671e8bd80d9a linux-2.6-xen-sparse/arch/ia64/xen/Makefile
--- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile Wed May 31 13:05:21 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile Wed May 31 14:34:33 2006 -0600
@@ -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 acabf4bdec4f -r 671e8bd80d9a linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c Wed May 31 13:05:21 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-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog