bitkeeper revision 1.1236.12.13 (422e46b74CDqIst0SkN2s80Urlmg0Q)

replaced check for shadow_mode_external

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index e2ecbe1f5b3f06c0bd503b757227db9aad938f26..3cd7205f921c62b5c9c828fe71108f694d57b76f 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -19,6 +19,7 @@ cl349@firebug.cl.cam.ac.uk
 cl349@freefall.cl.cam.ac.uk
 cl349@labyrinth.cl.cam.ac.uk
 cwc22@centipede.cl.cam.ac.uk
+cwc22@donkeykong.cl.cam.ac.uk
 djm@kirby.fc.hp.com
 gm281@boulderdash.cl.cam.ac.uk
 gm281@tetrapod.cl.cam.ac.uk

diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index 7233e28655c673f78a7f8e6b2eac1af62a9528b1..37e2384b900943e846a4f53ec19dbffefea346c2 100644 (file)
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1932,6 +1932,9 @@ void update_shadow_va_mapping(unsigned long va,
          * page was not shadowed, or that the L2 entry has not yet been
          * updated to reflect the shadow.
          */
+        if ( shadow_mode_external(current->domain) )
+            BUG(); // can't use linear_l2_table with external tables.
+
         l2_pgentry_t gpde = linear_l2_table[l2_table_offset(va)];
         unsigned long gpfn = l2_pgentry_val(gpde) >> PAGE_SHIFT;
 
@@ -2052,12 +2055,7 @@ int do_update_va_mapping(unsigned long va,
         rc = -EINVAL;
 
     if ( unlikely(shadow_mode_enabled(d)) )
-    {
-        if ( shadow_mode_external(current->domain) )
-            BUG(); // can't use linear_l2_table with external tables.
-
         update_shadow_va_mapping(va, val, ed, d);
-    }
 
     deferred_ops = percpu_info[cpu].deferred_ops;
     percpu_info[cpu].deferred_ops = 0;