# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1275473745 -3600
# Node ID 8dc07d072ed6e70031672fc854aef995b097f9ee
# Parent  f070bf3a3d163d46139795b1e4685ad69b46fce2
Suppress warnings about spurious pagefaults.

RHEL4 guests take a fair number of spurious pagefaults on Nehalem; no
need to report each one of them at XENLOG_WARNING.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>

diff -r f070bf3a3d16 -r 8dc07d072ed6 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c	Wed Jun 02 11:15:38 2010 +0100
+++ b/xen/arch/x86/traps.c	Wed Jun 02 11:15:45 2010 +0100
@@ -1175,10 +1175,7 @@
          (l2e_get_flags(l2e) & disallowed_flags) )
         return 0;
     if ( l2e_get_flags(l2e) & _PAGE_PSE )
-    {
-        l1e = l1e_empty(); /* define before use in debug tracing */
-        goto spurious;
-    }
+        return 1;
 
     l1t = map_domain_page(mfn);
     l1e = l1e_read_atomic(&l1t[l1_table_offset(addr)]);
@@ -1188,19 +1185,6 @@
          (l1e_get_flags(l1e) & disallowed_flags) )
         return 0;
 
- spurious:
-    dprintk(XENLOG_WARNING, "Spurious fault in domain %u:%u "
-            "at addr %lx, e/c %04x\n",
-            current->domain->domain_id, current->vcpu_id,
-            addr, error_code);
-#if CONFIG_PAGING_LEVELS >= 4
-    dprintk(XENLOG_WARNING, " l4e = %"PRIpte"\n", l4e_get_intpte(l4e));
-#endif
-#if CONFIG_PAGING_LEVELS >= 3
-    dprintk(XENLOG_WARNING, " l3e = %"PRIpte"\n", l3e_get_intpte(l3e));
-#endif
-    dprintk(XENLOG_WARNING, " l2e = %"PRIpte"\n", l2e_get_intpte(l2e));
-    dprintk(XENLOG_WARNING, " l1e = %"PRIpte"\n", l1e_get_intpte(l1e));
     return 1;
 }