mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1668.1.9 (42a8b831tFH6fPqu6A9bd_8WkrQHxg)
sn2 console patch Signed-off-by: Greg Edwards <edwardsg@sgi.com>
This commit is contained in:
djm@kirby.fc.hp.com committed
1 parent
b8c6de5a8b
commit
3c178b4c82
4 files changed
+13
-2
No files matched your search
@@ -9,7 +9,8 @@ OBJS = xensetup.o setup.o time.o irq.o ia64_ksyms.o process.o smp.o \
|
||||
xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
|
||||
extable.o linuxextable.o xenirq.o xentime.o \
|
||||
regionreg.o entry.o unaligned.o privop.o vcpu.o \
|
||||
irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o
|
||||
irq_ia64.o irq_lsapic.o vhpt.o xenasm.o hyperprivop.o dom_fw.o \
|
||||
sn_console.o
|
||||
|
||||
ifeq ($(CONFIG_VTI),y)
|
||||
OBJS += vmx_init.o vmx_virt.o vmx_vcpu.o vmx_process.o vmx_vsa.o vmx_ivt.o \
|
||||
|
||||
@@ -68,7 +68,7 @@ unsigned char acpi_legacy_devices;
|
||||
const char *
|
||||
acpi_get_sysname (void)
|
||||
{
|
||||
#ifdef CONFIG_IA64_GENERIC
|
||||
/* #ifdef CONFIG_IA64_GENERIC */
|
||||
unsigned long rsdp_phys;
|
||||
struct acpi20_table_rsdp *rsdp;
|
||||
struct acpi_table_xsdt *xsdt;
|
||||
@@ -101,6 +101,7 @@ acpi_get_sysname (void)
|
||||
}
|
||||
|
||||
return "dig";
|
||||
/*
|
||||
#else
|
||||
# if defined (CONFIG_IA64_HP_SIM)
|
||||
return "hpsim";
|
||||
@@ -114,6 +115,7 @@ acpi_get_sysname (void)
|
||||
# error Unknown platform. Fix acpi.c.
|
||||
# endif
|
||||
#endif
|
||||
*/
|
||||
}
|
||||
|
||||
#ifdef CONFIG_ACPI_BOOT
|
||||
|
||||
@@ -45,6 +45,7 @@ fi
|
||||
mkdir include/asm-generic
|
||||
mkdir include/asm-ia64/linux
|
||||
mkdir include/asm-ia64/linux/byteorder
|
||||
mkdir include/asm-ia64/sn
|
||||
# use "gcc -Iinclude/asm-ia64" to find these linux includes
|
||||
#ln -s $XEN/include/xen $XEN/include/linux
|
||||
#ln -s $XEN/include/asm-ia64/linux $XEN/include/asm-ia64/xen
|
||||
@@ -198,6 +199,12 @@ null include/asm-ia64/module.h
|
||||
null include/asm-ia64/ia32.h
|
||||
null include/asm-ia64/tlbflush.h
|
||||
|
||||
null include/asm-ia64/sn/arch.h
|
||||
null include/asm-ia64/sn/geo.h
|
||||
null include/asm-ia64/sn/nodepda.h
|
||||
null include/asm-ia64/sn/sn_cpuid.h
|
||||
cp_patch include/asm-ia64/sn/sn_sal.h include/asm-ia64/sn/sn_sal.h sn_sal.h
|
||||
|
||||
softlink include/asm-ia64/acpi.h include/asm-ia64/acpi.h
|
||||
softlink include/asm-ia64/asmmacro.h include/asm-ia64/asmmacro.h
|
||||
softlink include/asm-ia64/atomic.h include/asm-ia64/atomic.h
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#define CONFIG_IA64_GRANULE_16MB
|
||||
|
||||
#define CONFIG_EFI_PCDP
|
||||
#define CONFIG_SERIAL_SGI_L1_CONSOLE
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
|
||||