diff options
| author | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-13 21:03:39 +0000 |
|---|---|---|
| committer | iap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk> | 2005-08-13 21:03:39 +0000 |
| commit | 7349b2424eafba4775e41dbb9fb585d331c51609 (patch) | |
| tree | 615a77a8c41739b9cd545b9e139dca2797b5c244 | |
| parent | 1b0a09227d914ff00b8a1392df943efb9a97e707 (diff) | |
| parent | 4595c9c24e3417eeca7641f25be73c91ff3dcd31 (diff) | |
| download | xen-7349b2424eafba4775e41dbb9fb585d331c51609.tar.gz xen-7349b2424eafba4775e41dbb9fb585d331c51609.tar.bz2 xen-7349b2424eafba4775e41dbb9fb585d331c51609.zip | |
merge
| -rw-r--r-- | linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h | 4 | ||||
| -rw-r--r-- | 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)<<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 --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h index ef48c20ab1..d8066ea6f7 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h @@ -398,7 +398,7 @@ extern void noexec_setup(const char *str); 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 @@ 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)); \ } \ |