ia64/xen-unstable

changeset 4028:7d769527a546

bitkeeper revision 1.1236.12.13 (422e46b74CDqIst0SkN2s80Urlmg0Q)

replaced check for shadow_mode_external
author cwc22@donkeykong.cl.cam.ac.uk
date Wed Mar 09 00:43:35 2005 +0000 (2005-03-09)
parents 2c4150137150
children 2a8ffe96dc3d
files BitKeeper/etc/logging_ok xen/arch/x86/mm.c
line diff
     1.1 --- a/BitKeeper/etc/logging_ok	Tue Mar 08 23:04:52 2005 +0000
     1.2 +++ b/BitKeeper/etc/logging_ok	Wed Mar 09 00:43:35 2005 +0000
     1.3 @@ -19,6 +19,7 @@ cl349@firebug.cl.cam.ac.uk
     1.4  cl349@freefall.cl.cam.ac.uk
     1.5  cl349@labyrinth.cl.cam.ac.uk
     1.6  cwc22@centipede.cl.cam.ac.uk
     1.7 +cwc22@donkeykong.cl.cam.ac.uk
     1.8  djm@kirby.fc.hp.com
     1.9  gm281@boulderdash.cl.cam.ac.uk
    1.10  gm281@tetrapod.cl.cam.ac.uk
     2.1 --- a/xen/arch/x86/mm.c	Tue Mar 08 23:04:52 2005 +0000
     2.2 +++ b/xen/arch/x86/mm.c	Wed Mar 09 00:43:35 2005 +0000
     2.3 @@ -1932,6 +1932,9 @@ void update_shadow_va_mapping(unsigned l
     2.4           * page was not shadowed, or that the L2 entry has not yet been
     2.5           * updated to reflect the shadow.
     2.6           */
     2.7 +        if ( shadow_mode_external(current->domain) )
     2.8 +            BUG(); // can't use linear_l2_table with external tables.
     2.9 +
    2.10          l2_pgentry_t gpde = linear_l2_table[l2_table_offset(va)];
    2.11          unsigned long gpfn = l2_pgentry_val(gpde) >> PAGE_SHIFT;
    2.12  
    2.13 @@ -2052,12 +2055,7 @@ int do_update_va_mapping(unsigned long v
    2.14          rc = -EINVAL;
    2.15  
    2.16      if ( unlikely(shadow_mode_enabled(d)) )
    2.17 -    {
    2.18 -        if ( shadow_mode_external(current->domain) )
    2.19 -            BUG(); // can't use linear_l2_table with external tables.
    2.20 -
    2.21          update_shadow_va_mapping(va, val, ed, d);
    2.22 -    }
    2.23  
    2.24      deferred_ops = percpu_info[cpu].deferred_ops;
    2.25      percpu_info[cpu].deferred_ops = 0;