1.1 --- a/xen/arch/x86/vmx.c	Thu Feb 10 18:49:57 2005 +0000
     1.2 +++ b/xen/arch/x86/vmx.c	Thu Feb 10 22:58:57 2005 +0000
     1.3 @@ -193,7 +193,7 @@ static void vmx_vmexit_do_cpuid(unsigned
     1.4  }
     1.5  
     1.6  #define CASE_GET_REG_P(REG, reg)    \
     1.7 -    case REG_ ## REG: reg_p = &(regs->reg); break
     1.8 +    case REG_ ## REG: reg_p = (unsigned long *)&(regs->reg); break
     1.9  
    1.10  static void vmx_dr_access (unsigned long exit_qualification, struct xen_regs *regs)
    1.11  {

     2.1 --- a/xen/arch/x86/x86_32/seg_fixup.c	Thu Feb 10 18:49:57 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_32/seg_fixup.c	Thu Feb 10 22:58:57 2005 +0000
     2.3 @@ -293,7 +293,7 @@ int gpf_emulate_4gb(struct xen_regs *reg
     2.4      u32           disp32 = 0;
     2.5      u8            *eip;         /* ptr to instruction start */
     2.6      u8            *pb, b;       /* ptr into instr. / current instr. byte */
     2.7 -    unsigned long *pseg = NULL; /* segment for memory operand (NULL=default) */
     2.8 +    u32           *pseg = NULL; /* segment for memory operand (NULL=default) */
     2.9  
    2.10      /* WARNING: We only work for ring-3 segments. */
    2.11      if ( unlikely(VM86_MODE(regs)) || unlikely(!RING_3(regs)) )

     3.1 --- a/xen/include/public/arch-x86_32.h	Thu Feb 10 18:49:57 2005 +0000
     3.2 +++ b/xen/include/public/arch-x86_32.h	Thu Feb 10 22:58:57 2005 +0000
     3.3 @@ -94,9 +94,6 @@ typedef struct {
     3.4      memory_t address; /* 4: code address                                  */
     3.5  } PACKED trap_info_t; /* 8 bytes */
     3.6  
     3.7 -/* So that we can use 'l' modifier in printf-style format strings. */
     3.8 -#define u32 unsigned long
     3.9 -
    3.10  typedef struct xen_regs
    3.11  {
    3.12      u32 ebx;
    3.13 @@ -122,8 +119,6 @@ typedef struct xen_regs
    3.14      u32 gs;
    3.15  } PACKED execution_context_t;
    3.16  
    3.17 -#undef u32
    3.18 -
    3.19  typedef u64 tsc_timestamp_t; /* RDTSC timestamp */
    3.20  
    3.21  /*

     4.1 --- a/xen/include/xen/keyhandler.h	Thu Feb 10 18:49:57 2005 +0000
     4.2 +++ b/xen/include/xen/keyhandler.h	Thu Feb 10 22:58:57 2005 +0000
     4.3 @@ -10,7 +10,7 @@
     4.4  #ifndef __XEN_KEYHANDLER_H__
     4.5  #define __XEN_KEYHANDLER_H__
     4.6  
     4.7 -#include <asm/regs.h>
     4.8 +struct xen_regs;
     4.9  
    4.10  /*
    4.11   * Register a callback function for key @key. The callback occurs in

     5.1 --- a/xen/include/xen/types.h	Thu Feb 10 18:49:57 2005 +0000
     5.2 +++ b/xen/include/xen/types.h	Thu Feb 10 22:58:57 2005 +0000
     5.3 @@ -26,6 +26,7 @@ typedef unsigned short          ushort;
     5.4  typedef unsigned int            uint;
     5.5  typedef unsigned long           ulong;
     5.6  
     5.7 +#if 0
     5.8  #ifndef __BIT_TYPES_DEFINED__
     5.9  #define __BIT_TYPES_DEFINED__
    5.10  
    5.11 @@ -42,6 +43,7 @@ typedef         __u8            uint8_t;
    5.12  typedef         __u16           uint16_t;
    5.13  typedef         __u32           uint32_t;
    5.14  typedef         __u64           uint64_t;
    5.15 +#endif
    5.16  
    5.17  
    5.18  struct domain;