ia64/xen-unstable

changeset 2549:fb36d761997f

bitkeeper revision 1.1159.1.178 (41544dab_gRnRqMg-RHGMfNLih4KCQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Fri Sep 24 16:39:07 2004 +0000 (2004-09-24)
parents e3496a6ed8a8 5d8883c5a53a
children 14dd430a2130 6becc0cc3b8d
files xen/arch/x86/memory.c
line diff
     1.1 --- a/xen/arch/x86/memory.c	Fri Sep 24 16:28:58 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Fri Sep 24 16:39:07 2004 +0000
     1.3 @@ -1644,12 +1644,12 @@ void ptwr_flush(const int which)
     1.4          l1_pgentry_t ol1e, nl1e;
     1.5          nl1e = ptwr_info[cpu].ptinfo[which].page[i];
     1.6          ol1e = pl1e[i];
     1.7 -        if (likely(l1_pgentry_val(nl1e) == l1_pgentry_val(ol1e)))
     1.8 +        if (likely(l1_pgentry_val(ol1e) == l1_pgentry_val(nl1e)))
     1.9              continue;
    1.10 -        if (likely(l1_pgentry_val(nl1e) == (l1_pgentry_val(ol1e) | _PAGE_RW)))
    1.11 +        if (likely(l1_pgentry_val(ol1e) == (l1_pgentry_val(nl1e) | _PAGE_RW)))
    1.12          {
    1.13              if (likely(readonly_page_from_l1e(nl1e))) {
    1.14 -                pl1e[i] = ptwr_info[cpu].ptinfo[which].page[i];
    1.15 +                pl1e[i] = nl1e;
    1.16                  continue;
    1.17              }
    1.18          }
    1.19 @@ -1659,7 +1659,7 @@ void ptwr_flush(const int which)
    1.20              MEM_LOG("ptwr: Could not re-validate l1 page\n");
    1.21              domain_crash();
    1.22          }
    1.23 -        pl1e[i] = ptwr_info[cpu].ptinfo[which].page[i];
    1.24 +        pl1e[i] = nl1e;
    1.25      }
    1.26      unmap_domain_mem(pl1e);
    1.27