1.1 --- a/xen/arch/ia64/Makefile	Thu Jun 09 20:48:45 2005 +0000
     1.2 +++ b/xen/arch/ia64/Makefile	Thu Jun 09 21:44:17 2005 +0000
     1.3 @@ -9,7 +9,8 @@ OBJS = xensetup.o setup.o time.o irq.o i
     1.4  	xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
     1.5  	extable.o linuxextable.o xenirq.o xentime.o \
     1.6  	regionreg.o entry.o unaligned.o privop.o vcpu.o \
     1.7 -	irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o
     1.8 +	irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
     1.9 +	sn_console.o
    1.10  
    1.11  ifeq ($(CONFIG_VTI),y)
    1.12  OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o \

     2.1 --- a/xen/arch/ia64/acpi.c	Thu Jun 09 20:48:45 2005 +0000
     2.2 +++ b/xen/arch/ia64/acpi.c	Thu Jun 09 21:44:17 2005 +0000
     2.3 @@ -68,7 +68,7 @@ unsigned char acpi_legacy_devices;
     2.4  const char *
     2.5  acpi_get_sysname (void)
     2.6  {
     2.7 -#ifdef CONFIG_IA64_GENERIC
     2.8 +/* #ifdef CONFIG_IA64_GENERIC */
     2.9  	unsigned long rsdp_phys;
    2.10  	struct acpi20_table_rsdp *rsdp;
    2.11  	struct acpi_table_xsdt *xsdt;
    2.12 @@ -101,6 +101,7 @@ acpi_get_sysname (void)
    2.13  	}
    2.14  
    2.15  	return "dig";
    2.16 +/*
    2.17  #else
    2.18  # if defined (CONFIG_IA64_HP_SIM)
    2.19  	return "hpsim";
    2.20 @@ -114,6 +115,7 @@ acpi_get_sysname (void)
    2.21  #	error Unknown platform.  Fix acpi.c.
    2.22  # endif
    2.23  #endif
    2.24 +*/
    2.25  }
    2.26  
    2.27  #ifdef CONFIG_ACPI_BOOT

     3.1 --- a/xen/arch/ia64/tools/mkbuildtree	Thu Jun 09 20:48:45 2005 +0000
     3.2 +++ b/xen/arch/ia64/tools/mkbuildtree	Thu Jun 09 21:44:17 2005 +0000
     3.3 @@ -45,6 +45,7 @@ fi
     3.4  mkdir include/asm-generic
     3.5  mkdir include/asm-ia64/linux
     3.6  mkdir include/asm-ia64/linux/byteorder
     3.7 +mkdir include/asm-ia64/sn
     3.8  # use "gcc -Iinclude/asm-ia64" to find these linux includes
     3.9  #ln -s $XEN/include/xen $XEN/include/linux
    3.10  #ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen 
    3.11 @@ -198,6 +199,12 @@ null include/asm-ia64/module.h
    3.12  null include/asm-ia64/ia32.h
    3.13  null include/asm-ia64/tlbflush.h
    3.14  
    3.15 +null include/asm-ia64/sn/arch.h
    3.16 +null include/asm-ia64/sn/geo.h
    3.17 +null include/asm-ia64/sn/nodepda.h
    3.18 +null include/asm-ia64/sn/sn_cpuid.h
    3.19 +cp_patch include/asm-ia64/sn/sn_sal.h include/asm-ia64/sn/sn_sal.h sn_sal.h
    3.20 +
    3.21  softlink include/asm-ia64/acpi.h include/asm-ia64/acpi.h
    3.22  softlink include/asm-ia64/asmmacro.h include/asm-ia64/asmmacro.h
    3.23  softlink include/asm-ia64/atomic.h include/asm-ia64/atomic.h

     4.1 --- a/xen/include/asm-ia64/config.h	Thu Jun 09 20:48:45 2005 +0000
     4.2 +++ b/xen/include/asm-ia64/config.h	Thu Jun 09 21:44:17 2005 +0000
     4.3 @@ -19,6 +19,7 @@
     4.4  #define	CONFIG_IA64_GRANULE_16MB
     4.5  
     4.6  #define CONFIG_EFI_PCDP
     4.7 +#define CONFIG_SERIAL_SGI_L1_CONSOLE
     4.8  
     4.9  #ifndef __ASSEMBLY__
    4.10