[Xen-changelog] Remove shadow32 dead code (it's never built for other than

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 450c562b76aab05d8330a2337628b68766e58e6c
# Parent  d0ca851445e2cf79015bc072d4a537c305100cc6
Remove shadow32 dead code (it's never built for other than
x86_32).

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r d0ca851445e2 -r 450c562b76aa xen/arch/x86/shadow32.c
--- a/xen/arch/x86/shadow32.c   Tue Nov 29 10:48:33 2005
+++ b/xen/arch/x86/shadow32.c   Tue Nov 29 13:37:24 2005
@@ -342,14 +342,10 @@
 
     SH_VVLOG("%s: smfn=%lx freed", __func__, smfn);
 
-#ifdef __i386__
     if ( shadow_mode_external(d) )
         limit = L2_PAGETABLE_ENTRIES;
     else
         limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
-#else
-    limit = 0; /* XXX x86/64 XXX */
-#endif
 
     for ( i = 0; i < limit; i++ )
     {
@@ -740,11 +736,9 @@
     mpl2e = (l2_pgentry_t *)map_domain_page(mmfn);
     memset(mpl2e, 0, PAGE_SIZE);
 
-#ifdef __i386__ /* XXX screws x86/64 build */
     memcpy(&mpl2e[DOMAIN_ENTRIES_PER_L2_PAGETABLE], 
            &idle_pg_table[DOMAIN_ENTRIES_PER_L2_PAGETABLE],
            HYPERVISOR_ENTRIES_PER_L2_PAGETABLE * sizeof(l2_pgentry_t));
-#endif
 
     mpl2e[l2_table_offset(PERDOMAIN_VIRT_START)] =
         l2e_from_paddr(__pa(d->arch.mm_perdomain_pt),
@@ -1034,7 +1028,7 @@
     free_shadow_pages(d);
 
     /*
-     * Tear down it's counts by disassembling its page-table-based ref counts.
+     * Tear down its counts by disassembling its page-table-based ref counts.
      * Also remove CR3's gcount/tcount.
      * That leaves things like GDTs and LDTs and external refs in tact.
      *
@@ -3274,14 +3268,10 @@
                l2e_get_intpte(match));
     }
 
-#ifdef __i386__
     if ( shadow_mode_external(d) )
         limit = L2_PAGETABLE_ENTRIES;
     else
         limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
-#else
-    limit = 0; /* XXX x86/64 XXX */
-#endif
 
     /* Check the whole L2. */
     for ( i = 0; i < limit; i++ )
@@ -3343,14 +3333,10 @@
     spl2e = (l2_pgentry_t *) map_domain_page(smfn);
 
     /* Go back and recurse. */
-#ifdef __i386__
     if ( shadow_mode_external(d) )
         limit = L2_PAGETABLE_ENTRIES;
     else
         limit = DOMAIN_ENTRIES_PER_L2_PAGETABLE;
-#else
-    limit = 0; /* XXX x86/64 XXX */
-#endif
 
     for ( i = 0; i < limit; i++ )
     {
@@ -3366,11 +3352,6 @@
 
     unmap_domain_page(spl2e);
     unmap_domain_page(gpl2e);
-
-#if 0
-    SH_VVLOG("PT verified : l2_present = %d, l1_present = %d",
-             sh_l2_present, sh_l1_present);
-#endif
 
  out:
     if ( errors )
diff -r d0ca851445e2 -r 450c562b76aa xen/arch/x86/shadow_public.c
--- a/xen/arch/x86/shadow_public.c      Tue Nov 29 10:48:33 2005
+++ b/xen/arch/x86/shadow_public.c      Tue Nov 29 13:37:24 2005
@@ -1078,7 +1078,7 @@
     free_shadow_pages(d);
 
     /*
-     * Tear down it's counts by disassembling its page-table-based ref counts.
+     * Tear down its counts by disassembling its page-table-based ref counts.
      * Also remove CR3's gcount/tcount.
      * That leaves things like GDTs and LDTs and external refs in tact.
      *

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog