diff -r 7397608bce87 xen/arch/x86/mm/shadow/multi.c
--- a/xen/arch/x86/mm/shadow/multi.c	Mon Jun 29 15:50:32 2009 +0100
+++ b/xen/arch/x86/mm/shadow/multi.c	Fri Jul 03 14:49:37 2009 +0100
@@ -494,11 +494,13 @@
 
     if ( unlikely(!(gflags & _PAGE_PRESENT)) )
     {
+#if !(SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC)
         /* If a guest l1 entry is not present, shadow with the magic 
          * guest-not-present entry. */
         if ( level == 1 )
             *sp = sh_l1e_gnp();
         else 
+#endif /* !OOS */
             *sp = shadow_l1e_empty();
         goto done;
     }