ia64/xen-unstable

changeset 14140:ca1dd3480540

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Mon Feb 26 14:48:46 2007 +0000 (2007-02-26)
parents 90f37b1748a8 9be2dec913b7
children 0b5da89e2b3d
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Mon Feb 26 14:47:54 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Mon Feb 26 14:48:46 2007 +0000
     1.3 @@ -139,7 +139,11 @@ typedef struct { unsigned long pgprot; }
     1.4  static inline unsigned long pgd_val(pgd_t x)
     1.5  {
     1.6  	unsigned long ret = x.pgd;
     1.7 +#ifdef CONFIG_XEN_COMPAT_030002
     1.8 +	if (ret) ret = machine_to_phys(ret) | _PAGE_PRESENT;
     1.9 +#else
    1.10  	if (ret & _PAGE_PRESENT) ret = machine_to_phys(ret);
    1.11 +#endif
    1.12  	return ret;
    1.13  }
    1.14  #define HPAGE_SHIFT	22