[Xen-changelog] merge

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

# HG changeset patch
# User iap10@xxxxxxxxxxxxxxxxxxxxx
# Node ID 1de047fc56f571097d8ccd401ce651a4a1ac1acf
# Parent  8864f0be80c6352c0572752643bad1caa3ee45d9
# Parent  a8a88f85a3e6cdf7548747292df0f68718e86bd4
merge

diff -r 8864f0be80c6 -r 1de047fc56f5 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h   Sat Aug 13 
20:49:29 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h   Sat Aug 13 
21:03:39 2005
@@ -14,9 +14,9 @@
 do {                                                                   \
        if (unlikely((mm)->context.pinned)) {                           \
                if (!PageHighMem(pte))                                  \
-                       HYPERVISOR_update_va_mapping(                   \
+                       BUG_ON(HYPERVISOR_update_va_mapping(            \
                          (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT),\
-                         pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0);\
+                         pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0));\
                set_pmd(pmd, __pmd(_PAGE_TABLE +                        \
                        ((unsigned long long)page_to_pfn(pte) <<        \
                                (unsigned long long) PAGE_SHIFT)));     \
diff -r 8864f0be80c6 -r 1de047fc56f5 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h   Sat Aug 13 
20:49:29 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h   Sat Aug 13 
21:03:39 2005
@@ -398,7 +398,7 @@
        do {                                                              \
                if (__dirty) {                                            \
                        if ( likely((__vma)->vm_mm == current->mm) ) {    \
-                           HYPERVISOR_update_va_mapping((__address), 
(__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned 
long)((__vma)->vm_mm->cpu_vm_mask.bits)); \
+                           BUG_ON(HYPERVISOR_update_va_mapping((__address), 
(__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned 
long)((__vma)->vm_mm->cpu_vm_mask.bits))); \
                        } else {                                          \
                             xen_l1_entry_update((__ptep), (__entry)); \
                            flush_tlb_page((__vma), (__address));         \
@@ -416,8 +416,8 @@
 #define ptep_establish_new(__vma, __address, __ptep, __entry)          \
 do {                                                                   \
        if (likely((__vma)->vm_mm == current->mm)) {                    \
-               HYPERVISOR_update_va_mapping((__address),               \
-                                            __entry, 0);               \
+               BUG_ON(HYPERVISOR_update_va_mapping((__address),        \
+                                            __entry, 0));              \
        } else {                                                        \
                xen_l1_entry_update((__ptep), (__entry));       \
        }                                                               \

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