ia64/xen-unstable

changeset 104:033b3540eda0

bitkeeper revision 1.15.1.11 (3e36ac10Cjpk5gcskj82faSc-P4fzA)

Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/usr/groups/xeno/users/akw27/xeno
author akw27@labyrinth.cl.cam.ac.uk
date Tue Jan 28 16:13:04 2003 +0000 (2003-01-28)
parents 540e4f4c8e38 091bf5f5fa41
children cb2688ed1a23
files xen-2.4.16/common/domain_page.c xen-2.4.16/include/asm-i386/domain_page.h
line diff
     1.1 --- a/xen-2.4.16/common/domain_page.c	Mon Jan 27 12:05:24 2003 +0000
     1.2 +++ b/xen-2.4.16/common/domain_page.c	Tue Jan 28 16:13:04 2003 +0000
     1.3 @@ -51,7 +51,7 @@ void *map_domain_mem(unsigned long pa)
     1.4          if ( cache[idx] == 0 ) break;
     1.5      }
     1.6  
     1.7 -    cache[idx] = (pa & PAGE_MASK) | PAGE_HYPERVISOR;
     1.8 +    cache[idx] = (pa & PAGE_MASK) | __PAGE_HYPERVISOR;
     1.9  
    1.10      local_irq_restore(flags);
    1.11  
     2.1 --- a/xen-2.4.16/include/asm-i386/domain_page.h	Mon Jan 27 12:05:24 2003 +0000
     2.2 +++ b/xen-2.4.16/include/asm-i386/domain_page.h	Tue Jan 28 16:13:04 2003 +0000
     2.3 @@ -35,7 +35,7 @@ static inline void *map_domain_mem(unsig
     2.4                          (pa & ~PAGE_MASK));
     2.5      if ( (*pent & PAGE_MASK) != (pfn << PAGE_SHIFT) )
     2.6      {
     2.7 -        *pent = (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR;
     2.8 +        *pent = (pfn << PAGE_SHIFT) | __PAGE_HYPERVISOR;
     2.9          __flush_tlb_one(va);
    2.10      }
    2.11      return va;