1.1 --- a/xen/arch/x86/hvm/save.c	Thu Oct 11 09:41:16 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/save.c	Thu Oct 11 10:02:07 2007 +0100
     1.3 @@ -19,17 +19,15 @@
     1.4   */
     1.5  
     1.6  #include <xen/config.h>
     1.7 -#include <xen/compile.h>
     1.8  #include <xen/lib.h>
     1.9 +#include <xen/version.h>
    1.10  #include <public/version.h>
    1.11  #include <xen/sched.h>
    1.12 -
    1.13  #include <asm/hvm/hvm.h>
    1.14  #include <asm/hvm/support.h>
    1.15  #include <asm/hvm/domain.h>
    1.16  #include <asm/current.h>
    1.17  
    1.18 -
    1.19  /* List of handlers for various HVM save and restore types */
    1.20  static struct { 
    1.21      hvm_save_handler save;
    1.22 @@ -94,7 +92,7 @@ int hvm_save(struct domain *d, hvm_domai
    1.23      hdr.cpuid = eax;
    1.24  
    1.25      /* Save xen changeset */
    1.26 -    c = strrchr(XEN_CHANGESET, ':');
    1.27 +    c = strrchr(xen_changeset(), ':');
    1.28      if ( c )
    1.29          hdr.changeset = simple_strtoll(c, NULL, 16);
    1.30      else 
    1.31 @@ -170,7 +168,7 @@ int hvm_load(struct domain *d, hvm_domai
    1.32                 "does not match host (%#"PRIx32").\n", hdr.cpuid, eax);
    1.33  
    1.34  
    1.35 -    c = strrchr(XEN_CHANGESET, ':');
    1.36 +    c = strrchr(xen_changeset(), ':');
    1.37      if ( hdr.changeset == -1ULL )
    1.38          gdprintk(XENLOG_WARNING, 
    1.39                   "HVM restore: Xen changeset was not saved.\n");

     2.1 --- a/xen/drivers/video/vesa.c	Thu Oct 11 09:41:16 2007 +0100
     2.2 +++ b/xen/drivers/video/vesa.c	Thu Oct 11 10:02:07 2007 +0100
     2.3 @@ -5,7 +5,6 @@
     2.4   */
     2.5  
     2.6  #include <xen/config.h>
     2.7 -#include <xen/compile.h>
     2.8  #include <xen/init.h>
     2.9  #include <xen/lib.h>
    2.10  #include <xen/mm.h>

     3.1 --- a/xen/drivers/video/vga.c	Thu Oct 11 09:41:16 2007 +0100
     3.2 +++ b/xen/drivers/video/vga.c	Thu Oct 11 10:02:07 2007 +0100
     3.3 @@ -5,7 +5,6 @@
     3.4   */
     3.5  
     3.6  #include <xen/config.h>
     3.7 -#include <xen/compile.h>
     3.8  #include <xen/init.h>
     3.9  #include <xen/lib.h>
    3.10  #include <xen/mm.h>