bitkeeper revision 1.1108.1.22 (410518962WN2wQjVdY9ca4_URHt00A)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0

xen/arch/x86/domain.c

@@ -695,6 +695,8 @@ int construct_dom0(struct domain *p,
             mpt_alloc += PAGE_SIZE;
             *l2tab++ = mk_l2_pgentry((unsigned long)l1start | L2_PROT);
             clear_page(l1tab);
+            if ( count == 0 )
+                l1tab += l1_table_offset(v_start);
         }
         *l1tab++ = mk_l1_pgentry((mfn << PAGE_SHIFT) | L1_PROT);