ia64/xen-unstable

changeset 10234:671e8bd80d9a

[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>
author awilliam@xenbuild.aw
date Wed May 31 14:34:33 2006 -0600 (2006-05-31)
parents acabf4bdec4f
children 25483d9b55d4
files linux-2.6-xen-sparse/arch/ia64/kernel/setup.c linux-2.6-xen-sparse/arch/ia64/xen/Makefile linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Wed May 31 13:05:21 2006 -0600
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c	Wed May 31 14:34:33 2006 -0600
     1.3 @@ -347,8 +347,14 @@ early_console_setup (char *cmdline)
     1.4  	int earlycons = 0;
     1.5  
     1.6  #ifdef CONFIG_XEN
     1.7 -	if (!early_xen_console_setup(cmdline))
     1.8 +#ifndef CONFIG_IA64_HP_SIM
     1.9 +	if (is_running_on_xen()) {
    1.10 +		extern struct console hpsim_cons;
    1.11 +		hpsim_cons.flags |= CON_BOOT;
    1.12 +		register_console(&hpsim_cons);
    1.13  		earlycons++;
    1.14 +	}
    1.15 +#endif
    1.16  #endif
    1.17  #ifdef CONFIG_SERIAL_SGI_L1_CONSOLE
    1.18  	{
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile	Wed May 31 13:05:21 2006 -0600
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile	Wed May 31 14:34:33 2006 -0600
     2.3 @@ -2,7 +2,7 @@
     2.4  # Makefile for Xen components
     2.5  #
     2.6  
     2.7 -obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o
     2.8 +obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o
     2.9  
    2.10  obj-$(CONFIG_XEN_IA64_DOM0_VP) += hypervisor.o pci-dma-xen.o util.o
    2.11  pci-dma-xen-$(CONFIG_XEN_IA64_DOM0_VP) := ../../i386/kernel/pci-dma-xen.o
     3.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xenconsole.c	Wed May 31 13:05:21 2006 -0600
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,19 +0,0 @@
     3.4 -#include <linux/config.h>
     3.5 -#include <linux/console.h>
     3.6 -#include <asm/hypervisor.h>
     3.7 -
     3.8 -int
     3.9 -early_xen_console_setup (char *cmdline)
    3.10 -{
    3.11 -#ifdef CONFIG_XEN
    3.12 -#ifndef CONFIG_IA64_HP_SIM
    3.13 -	if (is_running_on_xen()) {
    3.14 -		extern struct console hpsim_cons;
    3.15 -		hpsim_cons.flags |= CON_BOOT;
    3.16 -		register_console(&hpsim_cons);
    3.17 -		return 0;
    3.18 -	}
    3.19 -#endif
    3.20 -#endif
    3.21 -	return -1;
    3.22 -}