# HG changeset patch
# User iap10@labyrinth.cl.cam.ac.uk
# Date 1098751021 0
# Node ID 524ade91f41f9857db3c1bff786a7f57cbf48942
# Parent  200e341efb4ba3b324909040409f03ed55b08024# Parent  9813b32b51f62e87d3748f84a8cf1711771720e1
bitkeeper revision 1.1159.1.280 (417d9c2dsQCkPThidkzK1AZFnLMZ8Q)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk


diff -r 200e341efb4b -r 524ade91f41f xen/include/asm-x86/shadow.h
--- a/xen/include/asm-x86/shadow.h	Tue Oct 26 00:30:55 2004 +0000
+++ b/xen/include/asm-x86/shadow.h	Tue Oct 26 00:37:01 2004 +0000
@@ -116,7 +116,7 @@ static inline int __mark_dirty( struct m
 #ifndef NDEBUG
     else if ( mfn < max_page )
     {
-        SH_LOG("mark_dirty OOR! mfn=%x pfn=%x max=%x (mm %p)",
+        SH_LOG("mark_dirty OOR! mfn=%x pfn=%lx max=%x (mm %p)",
                mfn, pfn, m->shadow_dirty_bitmap_size, m );
         SH_LOG("dom=%p caf=%08x taf=%08x\n", 
                frame_table[mfn].u.inuse.domain,