bitkeeper revision 1.1159.260.2 (420e0856crqXXEkQoCUddas8u5ksXA)

Rename check_pagetable() function to _check_pagetable to make it easier
to selectively enable it during debugging.  There's still the same
check_pagetable macro, but now it's used both when SHADOW_DEBUG is
enabled and disabled.

diff --git a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
index 41ac65177a1b02c2e4bfc029d0290db016a07ca0..01d67d43ad25a86f2725a0666b9ea8a41732ce49 100644 (file)
--- a/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@ -794,7 +794,7 @@ static int check_l1_table(
         BUG();                                                 \
     } while ( 0 )
 
-int check_pagetable(struct mm_struct *m, pagetable_t pt, char *s)
+int _check_pagetable(struct mm_struct *m, pagetable_t pt, char *s)
 {
     unsigned long gptbase = pagetable_val(pt);
     unsigned long gpfn, spfn;

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 33172926ef44b4acd773ed4f4bf3cc645a165ccd..97082e596400c4057a79d1c833cab80cd5ca3936 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -573,7 +573,8 @@ static inline void shadow_mk_pagetable(struct mm_struct *mm)
 }
 
 #if SHADOW_DEBUG
-extern int check_pagetable(struct mm_struct *m, pagetable_t pt, char *s);
+extern int _check_pagetable(struct mm_struct *m, pagetable_t pt, char *s);
+#define check_pagetable(m, pt, s) _check_pagetable(m, pt, s)
 #else
 #define check_pagetable(m, pt, s) ((void)0)
 #endif