ia64/xen-unstable

changeset 1892:f775b5d07cde

bitkeeper revision 1.1127 (41011c75HBscQuGBFbr4yzRfqkPtUg)

disable count checks since we do the validation ourselves
author cl349@freefall.cl.cam.ac.uk
date Fri Jul 23 14:11:01 2004 +0000 (2004-07-23)
parents bf53c6ec6e23
children dae98734f12e
files xen/arch/x86/memory.c
line diff
     1.1 --- a/xen/arch/x86/memory.c	Fri Jul 23 12:12:22 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Fri Jul 23 14:11:01 2004 +0000
     1.3 @@ -1317,11 +1317,13 @@ void ptwr_reconnect_disconnected(unsigne
     1.4      unmap_domain_mem(pl1e);
     1.5      update_l2e(pl2e, *pl2e, nl2e);
     1.6  
     1.7 +#if 0
     1.8      if (page->count_and_flags & PGC_guest_pinned) {
     1.9          if ((page->type_and_flags & PGT_count_mask) != 1)
    1.10              BUG();
    1.11          page->type_and_flags++;
    1.12      }
    1.13 +#endif
    1.14      PTWR_PRINTK("now pl2e %p l2e %08lx              taf %08x/%08x/%u\n", pl2e,
    1.15                  l2_pgentry_val(*pl2e),
    1.16                  frame_table[pfn].type_and_flags,
    1.17 @@ -1395,11 +1397,13 @@ void ptwr_flush_inactive(void)
    1.18          }
    1.19          unmap_domain_mem(pl1e);
    1.20  
    1.21 +#if 0
    1.22          if (page->count_and_flags & PGC_guest_pinned) {
    1.23              if ((page->type_and_flags & PGT_count_mask) != 1)
    1.24                  BUG();
    1.25              page->type_and_flags++;
    1.26          }
    1.27 +#endif
    1.28          /* make pt page writable */
    1.29          PTWR_PRINTK("writable_l1 at %p is %08lx\n", ptwr_writables[cpu][idx],
    1.30                      pte);
    1.31 @@ -1446,6 +1450,7 @@ int ptwr_do_page_fault(unsigned long add
    1.32              PTWR_PRINTK("page_fault on l1 pt at va %08lx, pt for %08x, pfn %08lx\n",
    1.33                          addr, ((page->type_and_flags & PGT_va_mask) >>
    1.34                                 PGT_va_shift) << L2_PAGETABLE_SHIFT, pfn);
    1.35 +#if 0
    1.36              if (page->count_and_flags & PGC_guest_pinned) {
    1.37                  PTWR_PRINTK(" pinned l1 page %p taf %08x/%08x\n", page,
    1.38                              page->type_and_flags, page->count_and_flags);
    1.39 @@ -1453,6 +1458,7 @@ int ptwr_do_page_fault(unsigned long add
    1.40                      BUG();
    1.41                  page->type_and_flags--;
    1.42              }
    1.43 +#endif
    1.44              if (l2_pgentry_val(*pl2e) >> PAGE_SHIFT != pfn) {
    1.45                  l1_pgentry_t *pl1e;
    1.46                  PTWR_PRINTK("freeing l1 page %p taf %08x/%08x\n", page,
    1.47 @@ -1461,8 +1467,10 @@ int ptwr_do_page_fault(unsigned long add
    1.48                      ptwr_flush_inactive();
    1.49                  ptwr_writables[cpu][ptwr_writable_idx[cpu]] = (unsigned long *)
    1.50                      &linear_pg_table[addr>>PAGE_SHIFT];
    1.51 +#if 0
    1.52                  if ((page->type_and_flags & PGT_count_mask) != 1)
    1.53                      BUG();
    1.54 +#endif
    1.55  
    1.56                  pl1e = map_domain_mem(pfn << PAGE_SHIFT);
    1.57                  memcpy(&ptwr_writable_page[cpu][ptwr_writable_idx[cpu]][0],