bitkeeper revision 1.1159.187.71 (41c82f9fKeodufnpl2tEhvkIWWlYjw)

Fix shadow bug.

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index 77b09551d940027c50997e4eb675740782efb6cf..aa4afc3cda06c65a388259cc4a8a348601888bcc 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -517,10 +517,10 @@ static void shadow_map_l1_into_current_l2(unsigned long va)
             mk_l2_pgentry(spde);
 
         gpl1e = (unsigned long *) &(linear_pg_table[
-            (va>>PAGE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)]);
+            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
 
-        spl1e = (unsigned long *) &shadow_linear_pg_table[
-            (va>>PAGE_SHIFT) & ~(ENTRIES_PER_L1_PAGETABLE-1)];
+        spl1e = (unsigned long *) &(shadow_linear_pg_table[
+            (va>>L1_PAGETABLE_SHIFT) & (ENTRIES_PER_L1_PAGETABLE-1)]);
 
         for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ )
             l1pte_propagate_from_guest(m, &gpl1e[i], &spl1e[i]);