From 4595c9c24e3417eeca7641f25be73c91ff3dcd31 Mon Sep 17 00:00:00 2001 From: "iap10@freefall.cl.cam.ac.uk" Date: Sat, 13 Aug 2005 21:01:35 +0000 Subject: I missed a couple of files out of the patch to wrap calls to update_va_mapping with BUG_ON(). [We really need an equivalent of 'citool' for mercurial...] Signed-off-by: ian@xensource.com --- linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 4 ++-- linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h index 2c30b449f1..f559b93a5f 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h @@ -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)<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 @@ do { \ #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)); \ } \ -- cgit v1.2.3