ia64/xen-unstable

changeset 4440:281cdf5f5f64

bitkeeper revision 1.1236.1.196 (424db561VR_6nEc21FjFYEo8bC8SkQ)

ia64: catch up with latest -unstable
author djm@sportsman.spdomain
date Fri Apr 01 20:56:01 2005 +0000 (2005-04-01)
parents 528e86541344
children 4cc1f53d83e8 1081b873c010
files xen/arch/ia64/Makefile xen/include/asm-ia64/config.h
line diff
     1.1 --- a/xen/arch/ia64/Makefile	Fri Apr 01 20:46:41 2005 +0000
     1.2 +++ b/xen/arch/ia64/Makefile	Fri Apr 01 20:56:01 2005 +0000
     1.3 @@ -6,7 +6,7 @@ OBJS = xensetup.o setup.o time.o irq.o i
     1.4  	xenmisc.o pdb-stub.o acpi.o hypercall.o \
     1.5  	machvec.o dom0_ops.o domain.o \
     1.6  	idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
     1.7 -	sal.o cmdline.o mm_init.o tlb.o \
     1.8 +	sal.o cmdline.o mm_init.o tlb.o smpboot.o \
     1.9  	extable.o linuxextable.o \
    1.10  	regionreg.o entry.o unaligned.o privop.o vcpu.o \
    1.11  	irq_ia64.o irq_lsapic.o hpsim_irq.o vhpt.o xenasm.o dom_fw.o
     2.1 --- a/xen/include/asm-ia64/config.h	Fri Apr 01 20:46:41 2005 +0000
     2.2 +++ b/xen/include/asm-ia64/config.h	Fri Apr 01 20:56:01 2005 +0000
     2.3 @@ -217,6 +217,10 @@ void sort_main_extable(void);
     2.4  #define ARCH_HAS_EXEC_DOMAIN_MM_PTR
     2.5  
     2.6  // see arch/x86/nmi.c !?!?
     2.7 +
     2.8 +// these declarations got moved at some point, find a better place for them
     2.9 +extern int opt_noht;
    2.10 +extern int ht_per_core;
    2.11  extern unsigned int watchdog_on;
    2.12  
    2.13  // xen/include/asm/config.h