1.1 --- a/xen/arch/x86/Makefile	Thu Dec 16 15:41:47 2004 +0000
     1.2 +++ b/xen/arch/x86/Makefile	Thu Dec 16 15:47:33 2004 +0000
     1.3 @@ -12,11 +12,11 @@ OBJS += $(patsubst %.c,%.o,$(wildcard mt
     1.4  
     1.5  OBJS := $(subst $(TARGET_SUBARCH)/asm-offsets.o,,$(OBJS))
     1.6  
     1.7 -ifneq ($(TARGET_SUBARCH),i386)
     1.8 +ifneq ($(TARGET_SUBARCH),x86_32)
     1.9  OBJS := $(subst vmx.o,,$(OBJS))
    1.10  OBJS := $(subst vmx_io.o,,$(OBJS))
    1.11  OBJS := $(subst vmx_vmcs.o,,$(OBJS))
    1.12 -endif ($(TARGET_SUBARCH),i386)
    1.13 +endif ($(TARGET_SUBARCH),x86_32)
    1.14  
    1.15  default: boot/$(TARGET_SUBARCH).o $(OBJS) boot/mkelf32
    1.16  	$(LD) $(LDFLAGS) -r -o arch.o $(OBJS)

     2.1 --- a/xen/common/softirq.c	Thu Dec 16 15:41:47 2004 +0000
     2.2 +++ b/xen/common/softirq.c	Thu Dec 16 15:47:33 2004 +0000
     2.3 @@ -13,7 +13,6 @@
     2.4  #include <xen/init.h>
     2.5  #include <xen/mm.h>
     2.6  #include <xen/sched.h>
     2.7 -#include <asm/vmx_vmcs.h>
     2.8  #include <xen/softirq.h>
     2.9  
    2.10  irq_cpustat_t irq_stat[NR_CPUS];