bitkeeper revision 1.21 (3e3927b6hN1524UpgFH5zD53TxEdKA)

Merge boulderdash.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into boulderdash.cl.cam.ac.uk:/local/scratch/bd240/xeno

xen-2.4.16/common/domain_page.c

@@ -51,7 +51,7 @@ void *map_domain_mem(unsigned long pa)
         if ( cache[idx] == 0 ) break;
     }
 
-    cache[idx] = (pa & PAGE_MASK) | PAGE_HYPERVISOR;
+    cache[idx] = (pa & PAGE_MASK) | __PAGE_HYPERVISOR;
 
     local_irq_restore(flags);
 

xen-2.4.16/include/asm-i386/domain_page.h

@@ -35,7 +35,7 @@ static inline void *map_domain_mem(unsigned long pa)
                         (pa & ~PAGE_MASK));
     if ( (*pent & PAGE_MASK) != (pfn << PAGE_SHIFT) )
     {
-        *pent = (pfn << PAGE_SHIFT) | PAGE_HYPERVISOR;
+        *pent = (pfn << PAGE_SHIFT) | __PAGE_HYPERVISOR;
         __flush_tlb_one(va);
     }
     return va;