map_domain_page per-vcpu cache still seems broken. Disable

while I fix it.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/arch/x86/x86_32/domain_page.c b/xen/arch/x86/x86_32/domain_page.c
index f835beee52f4ad5bcc6b31a5f30408dd6cea1183..0189c737f33090f9ae3b1a077d39336bf480b755 100644 (file)
--- a/xen/arch/x86/x86_32/domain_page.c
+++ b/xen/arch/x86/x86_32/domain_page.c
@@ -40,6 +40,7 @@ void *map_domain_page(unsigned long pfn)
     cache = &d->arch.mapcache;
 
     hashent = &cache->vcpu_maphash[vcpu].hash[MAPHASH_HASHFN(pfn)];
+#if 0
     if ( hashent->pfn == pfn )
     {
         idx = hashent->idx;
@@ -48,6 +49,7 @@ void *map_domain_page(unsigned long pfn)
         ASSERT(l1e_get_pfn(cache->l1tab[idx]) == pfn);
         goto out;
     }
+#endif
 
     spin_lock(&cache->lock);
 
@@ -90,7 +92,7 @@ void *map_domain_page(unsigned long pfn)
 
     cache->l1tab[idx] = l1e_from_pfn(pfn, __PAGE_HYPERVISOR);
 
- out:
+/*out:*/
     va = MAPCACHE_VIRT_START + (idx << PAGE_SHIFT);
     return (void *)va;
 }