ia64/xen-unstable

changeset 14819:423c4a7b82e6

PV-on-HVM: Fix 64-bit build.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Apr 12 08:02:38 2007 +0100 (2007-04-12)
parents d56692b16296
children 38f3a6dedad6
files unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
line diff
     1.1 --- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Wed Apr 11 23:05:07 2007 +0100
     1.2 +++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h	Thu Apr 12 08:02:38 2007 +0100
     1.3 @@ -2,8 +2,8 @@
     1.4  #define COMPAT_INCLUDE_XEN_PLATFORM_COMPAT_H
     1.5  
     1.6  #include <linux/version.h>
     1.7 -
     1.8  #include <linux/spinlock.h>
     1.9 +#include <asm/maddr.h>
    1.10  
    1.11  #if defined(__LINUX_COMPILER_H) && !defined(__always_inline)
    1.12  #define __always_inline inline
    1.13 @@ -98,8 +98,6 @@ extern char *kasprintf(gfp_t gfp, const 
    1.14  
    1.15  #if defined(_PAGE_PRESENT) && !defined(_PAGE_NX)
    1.16  #define _PAGE_NX 0
    1.17 -#endif
    1.18 -
    1.19  /*
    1.20   * This variable at present is referenced by netfront, but only in code that
    1.21   * is dead when running in hvm guests. To detect potential active uses of it
    1.22 @@ -107,5 +105,6 @@ extern char *kasprintf(gfp_t gfp, const 
    1.23   * mappings created with it will fault when accessed.
    1.24   */
    1.25  #define __supported_pte_mask ((maddr_t)0)
    1.26 +#endif
    1.27  
    1.28  #endif