1.1 --- a/xen/arch/x86/shadow32.c	Tue Nov 29 11:48:33 2005 +0100
     1.2 +++ b/xen/arch/x86/shadow32.c	Tue Nov 29 14:37:24 2005 +0100
     1.3 @@ -342,14 +342,10 @@ free_shadow_hl2_table(struct domain *d, 
     1.4  
     1.5      SH_VVLOG("%s: smfn=%lx freed", __func__, smfn);
     1.6  
     1.7 -#ifdef __i386__
     1.8      if ( shadow_mode_external(d) )
     1.9          limit = L2_PAGETABLE_ENTRIES;
    1.10      else
    1.11          limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
    1.12 -#else
    1.13 -    limit = 0; /* XXX x86/64 XXX */
    1.14 -#endif
    1.15  
    1.16      for ( i = 0; i < limit; i++ )
    1.17      {
    1.18 @@ -740,11 +736,9 @@ static void alloc_monitor_pagetable(stru
    1.19      mpl2e = (l2_pgentry_t *)map_domain_page(mmfn);
    1.20      memset(mpl2e, 0, PAGE_SIZE);
    1.21  
    1.22 -#ifdef __i386__ /* XXX screws x86/64 build */
    1.23      memcpy(&mpl2e[DOMAIN_ENTRIES_PER_L2_PAGETABLE], 
    1.24             &idle_pg_table[DOMAIN_ENTRIES_PER_L2_PAGETABLE],
    1.25             HYPERVISOR_ENTRIES_PER_L2_PAGETABLE * sizeof(l2_pgentry_t));
    1.26 -#endif
    1.27  
    1.28      mpl2e[l2_table_offset(PERDOMAIN_VIRT_START)] =
    1.29          l2e_from_paddr(__pa(d->arch.mm_perdomain_pt),
    1.30 @@ -1034,7 +1028,7 @@ int __shadow_mode_enable(struct domain *
    1.31      free_shadow_pages(d);
    1.32  
    1.33      /*
    1.34 -     * Tear down it's counts by disassembling its page-table-based ref counts.
    1.35 +     * Tear down its counts by disassembling its page-table-based ref counts.
    1.36       * Also remove CR3's gcount/tcount.
    1.37       * That leaves things like GDTs and LDTs and external refs in tact.
    1.38       *
    1.39 @@ -3274,14 +3268,10 @@ int check_l2_table(
    1.40                 l2e_get_intpte(match));
    1.41      }
    1.42  
    1.43 -#ifdef __i386__
    1.44      if ( shadow_mode_external(d) )
    1.45          limit = L2_PAGETABLE_ENTRIES;
    1.46      else
    1.47          limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
    1.48 -#else
    1.49 -    limit = 0; /* XXX x86/64 XXX */
    1.50 -#endif
    1.51  
    1.52      /* Check the whole L2. */
    1.53      for ( i = 0; i < limit; i++ )
    1.54 @@ -3343,14 +3333,10 @@ int _check_pagetable(struct vcpu *v, cha
    1.55      spl2e = (l2_pgentry_t *) map_domain_page(smfn);
    1.56  
    1.57      /* Go back and recurse. */
    1.58 -#ifdef __i386__
    1.59      if ( shadow_mode_external(d) )
    1.60          limit = L2_PAGETABLE_ENTRIES;
    1.61      else
    1.62          limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
    1.63 -#else
    1.64 -    limit = 0; /* XXX x86/64 XXX */
    1.65 -#endif
    1.66  
    1.67      for ( i = 0; i < limit; i++ )
    1.68      {
    1.69 @@ -3367,11 +3353,6 @@ int _check_pagetable(struct vcpu *v, cha
    1.70      unmap_domain_page(spl2e);
    1.71      unmap_domain_page(gpl2e);
    1.72  
    1.73 -#if 0
    1.74 -    SH_VVLOG("PT verified : l2_present = %d, l1_present = %d",
    1.75 -             sh_l2_present, sh_l1_present);
    1.76 -#endif
    1.77 -
    1.78   out:
    1.79      if ( errors )
    1.80          BUG();

     2.1 --- a/xen/arch/x86/shadow_public.c	Tue Nov 29 11:48:33 2005 +0100
     2.2 +++ b/xen/arch/x86/shadow_public.c	Tue Nov 29 14:37:24 2005 +0100
     2.3 @@ -1078,7 +1078,7 @@ int __shadow_mode_enable(struct domain *
     2.4      free_shadow_pages(d);
     2.5  
     2.6      /*
     2.7 -     * Tear down it's counts by disassembling its page-table-based ref counts.
     2.8 +     * Tear down its counts by disassembling its page-table-based ref counts.
     2.9       * Also remove CR3's gcount/tcount.
    2.10       * That leaves things like GDTs and LDTs and external refs in tact.
    2.11       *