1.1 --- a/xen/arch/x86/cpu/intel.c	Mon Feb 06 16:51:06 2006 +0100
     1.2 +++ b/xen/arch/x86/cpu/intel.c	Mon Feb 06 16:55:41 2006 +0100
     1.3 @@ -10,8 +10,6 @@
     1.4  #include <asm/mpspec.h>
     1.5  #include <asm/apic.h>
     1.6  #include <mach_apic.h>
     1.7 -#include <asm/hvm/vpit.h>
     1.8 -#include <asm/hvm/vcpu.h>
     1.9  #include <asm/hvm/support.h>
    1.10  
    1.11  #include "cpu.h"

     2.1 --- a/xen/arch/x86/dom0_ops.c	Mon Feb 06 16:51:06 2006 +0100
     2.2 +++ b/xen/arch/x86/dom0_ops.c	Mon Feb 06 16:55:41 2006 +0100
     2.3 @@ -454,8 +454,8 @@ void arch_getdomaininfo_ctxt(
     2.4  
     2.5      if ( HVM_DOMAIN(v) )
     2.6      {
     2.7 -	hvm_store_cpu_guest_regs(v, &c->user_regs);
     2.8 -	hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
     2.9 +        hvm_store_cpu_guest_regs(v, &c->user_regs);
    2.10 +        hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
    2.11      }
    2.12      else
    2.13      {
    2.14 @@ -476,3 +476,13 @@ void arch_getdomaininfo_ctxt(
    2.15  
    2.16      c->vm_assist = v->domain->vm_assist;
    2.17  }
    2.18 +
    2.19 +/*
    2.20 + * Local variables:
    2.21 + * mode: C
    2.22 + * c-set-style: "BSD"
    2.23 + * c-basic-offset: 4
    2.24 + * tab-width: 4
    2.25 + * indent-tabs-mode: nil
    2.26 + * End:
    2.27 + */

     3.1 --- a/xen/arch/x86/x86_64/mm.c	Mon Feb 06 16:51:06 2006 +0100
     3.2 +++ b/xen/arch/x86/x86_64/mm.c	Mon Feb 06 16:55:41 2006 +0100
     3.3 @@ -188,7 +188,7 @@ long subarch_memory_op(int op, void *arg
     3.4      l3_pgentry_t l3e;
     3.5      l2_pgentry_t l2e;
     3.6      unsigned long mfn, v;
     3.7 -    unsigned int i = 0;
     3.8 +    unsigned int i;
     3.9      long rc = 0;
    3.10  
    3.11      switch ( op )