direct-io.hg

changeset 2473:c02736a96f00

bitkeeper revision 1.1159.1.150 (414576ba0IIZE6x_zn_bG-e7NfcSzw)

Don't reconnected disconnected page since we do not disconnect it any more.
(disconnect was removed in rev 1.48)
author cl349@freefall.cl.cam.ac.uk
date Mon Sep 13 10:30:18 2004 +0000 (2004-09-13)
parents 4e0f3f0e2c97
children c3fbcaa24a41
files xen/arch/x86/memory.c
line diff
     1.1 --- a/xen/arch/x86/memory.c	Mon Sep 13 10:09:02 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Mon Sep 13 10:30:18 2004 +0000
     1.3 @@ -1637,8 +1637,8 @@ void ptwr_reconnect_disconnected(void)
     1.4      unsigned long pte;
     1.5  #ifdef VERBOSE
     1.6      unsigned long pfn;
     1.7 +    l2_pgentry_t *pl2e;
     1.8  #endif
     1.9 -    l2_pgentry_t *pl2e, nl2e;
    1.10      l1_pgentry_t *pl1e;
    1.11      int cpu = smp_processor_id();
    1.12      int i;
    1.13 @@ -1648,9 +1648,9 @@ void ptwr_reconnect_disconnected(void)
    1.14      PTWR_PRINTK(PP_A, ("[A] page fault in disconn space %08lx\n",
    1.15                         ptwr_info[cpu].disconnected_pteidx <<
    1.16                         L2_PAGETABLE_SHIFT));
    1.17 -    pl2e = &linear_l2_table[ptwr_info[cpu].disconnected_pteidx];
    1.18  
    1.19  #ifdef VERBOSE
    1.20 +    pl2e = &linear_l2_table[ptwr_info[cpu].disconnected_pteidx];
    1.21      pfn = ptwr_info[cpu].disconnected_pte >> PAGE_SHIFT;
    1.22  #endif
    1.23      PTWR_PRINTK(PP_A, ("[A]     pl2e %p l2e %08lx pfn %08lx taf %08x/%08x\n",
    1.24 @@ -1660,7 +1660,6 @@ void ptwr_reconnect_disconnected(void)
    1.25                         frame_table[pfn].u.inuse.type_info,
    1.26                         frame_table[pfn].count_info));
    1.27  
    1.28 -    nl2e = mk_l2_pgentry(l2_pgentry_val(*pl2e) | _PAGE_PRESENT);
    1.29      pl1e = ptwr_info[cpu].disconnected_pl1e;
    1.30      for ( i = 0; i < ENTRIES_PER_L1_PAGETABLE; i++ ) {
    1.31          l1_pgentry_t ol1e, nl1e;
    1.32 @@ -1684,8 +1683,6 @@ void ptwr_reconnect_disconnected(void)
    1.33          pl1e[i] = ptwr_info[cpu].disconnected_page[i];
    1.34      }
    1.35      unmap_domain_mem(pl1e);
    1.36 -    /* reconnect l1 page */
    1.37 -    update_l2e(pl2e, *pl2e, nl2e);
    1.38  
    1.39      PTWR_PRINTK(PP_A,
    1.40                  ("[A] now pl2e %p l2e %08lx              taf %08x/%08x\n",