ia64/xen-unstable
changeset 19822:1b6616141e82
x86 shadow: Fix a few SHOPT_OUT_OF_SYNC ifdefs.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author | Keir Fraser <keir.fraser@citrix.com> |
---|---|
date | Wed Jun 24 10:47:07 2009 +0100 (2009-06-24) |
parents | 442fb5f1e0a2 |
children | 82bbce59b65d |
files | xen/arch/x86/mm/shadow/multi.c |
line diff
1.1 --- a/xen/arch/x86/mm/shadow/multi.c Tue Jun 23 17:32:07 2009 +0100 1.2 +++ b/xen/arch/x86/mm/shadow/multi.c Wed Jun 24 10:47:07 2009 +0100 1.3 @@ -1768,7 +1768,7 @@ static shadow_l3e_t * shadow_get_and_cre 1.4 if ( r & SHADOW_SET_ERROR ) 1.5 return NULL; 1.6 1.7 -#if (SHADOW_OPTIMIZATIONS && SHOPT_OUT_OF_SYNC ) 1.8 +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) 1.9 *resync |= 1; 1.10 #endif 1.11 1.12 @@ -1823,7 +1823,7 @@ static shadow_l2e_t * shadow_get_and_cre 1.13 if ( r & SHADOW_SET_ERROR ) 1.14 return NULL; 1.15 1.16 -#if (SHADOW_OPTIMIZATIONS && SHOPT_OUT_OF_SYNC ) 1.17 +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) 1.18 *resync |= 1; 1.19 #endif 1.20 1.21 @@ -1920,7 +1920,7 @@ static shadow_l1e_t * shadow_get_and_cre 1.22 (void) shadow_l1_index(sl1mfn, guest_l1_table_offset(gw->va)); 1.23 } 1.24 1.25 -#if (SHADOW_OPTIMIZATIONS && SHOPT_OUT_OF_SYNC ) 1.26 +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) 1.27 /* All pages walked are now pagetables. Safe to resync pages 1.28 in case level 4 or 3 shadows were set. */ 1.29 if ( resync ) 1.30 @@ -2202,7 +2202,7 @@ static int validate_gl4e(struct vcpu *v, 1.31 else if ( p2mt != p2m_populate_on_demand ) 1.32 result |= SHADOW_SET_ERROR; 1.33 1.34 -#if (SHADOW_OPTIMIZATIONS && SHOPT_OUT_OF_SYNC ) 1.35 +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) 1.36 if ( mfn_valid(sl3mfn) ) 1.37 shadow_resync_all(v, 0); 1.38 #endif 1.39 @@ -2259,7 +2259,7 @@ static int validate_gl3e(struct vcpu *v, 1.40 else if ( p2mt != p2m_populate_on_demand ) 1.41 result |= SHADOW_SET_ERROR; 1.42 1.43 -#if (SHADOW_OPTIMIZATIONS && SHOPT_OUT_OF_SYNC ) 1.44 +#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC ) 1.45 if ( mfn_valid(sl2mfn) ) 1.46 shadow_resync_all(v, 0); 1.47 #endif