[Xen-changelog] ia64: catch up with latest -unstable

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1432, 2005/04/01 13:56:01-07:00, djm@xxxxxxxxxxxxxxxxxx

        ia64: catch up with latest -unstable



 arch/ia64/Makefile        |    2 +-
 include/asm-ia64/config.h |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)


diff -Nru a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile    2005-04-01 19:03:28 -05:00
+++ b/xen/arch/ia64/Makefile    2005-04-01 19:03:28 -05:00
@@ -6,7 +6,7 @@
        xenmisc.o pdb-stub.o acpi.o hypercall.o \
        machvec.o dom0_ops.o domain.o \
        idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
-       sal.o cmdline.o mm_init.o tlb.o \
+       sal.o cmdline.o mm_init.o tlb.o smpboot.o \
        extable.o linuxextable.o \
        regionreg.o entry.o unaligned.o privop.o vcpu.o \
        irq_ia64.o irq_lsapic.o hpsim_irq.o vhpt.o xenasm.o dom_fw.o
diff -Nru a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     2005-04-01 19:03:28 -05:00
+++ b/xen/include/asm-ia64/config.h     2005-04-01 19:03:28 -05:00
@@ -217,6 +217,10 @@
 #define ARCH_HAS_EXEC_DOMAIN_MM_PTR
 
 // see arch/x86/nmi.c !?!?
+
+// these declarations got moved at some point, find a better place for them
+extern int opt_noht;
+extern int ht_per_core;
 extern unsigned int watchdog_on;
 
 // xen/include/asm/config.h

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog