ia64/xen-unstable

changeset 6152:a8a88f85a3e6

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
author iap10@freefall.cl.cam.ac.uk
date Sat Aug 13 21:01:35 2005 +0000 (2005-08-13)
parents 424166f4f3cf
children 1de047fc56f5 08d19da852c7
files linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Sat Aug 13 20:47:47 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Sat Aug 13 21:01:35 2005 +0000
     1.3 @@ -14,9 +14,9 @@
     1.4  do {									\
     1.5  	if (unlikely((mm)->context.pinned)) {				\
     1.6  		if (!PageHighMem(pte))					\
     1.7 -			HYPERVISOR_update_va_mapping(			\
     1.8 +			BUG_ON(HYPERVISOR_update_va_mapping(		\
     1.9  			  (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT),\
    1.10 -			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0);\
    1.11 +			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0));\
    1.12  		set_pmd(pmd, __pmd(_PAGE_TABLE +			\
    1.13  			((unsigned long long)page_to_pfn(pte) <<	\
    1.14  				(unsigned long long) PAGE_SHIFT)));	\
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Sat Aug 13 20:47:47 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Sat Aug 13 21:01:35 2005 +0000
     2.3 @@ -398,7 +398,7 @@ extern void noexec_setup(const char *str
     2.4  	do {								  \
     2.5  		if (__dirty) {						  \
     2.6  		        if ( likely((__vma)->vm_mm == current->mm) ) {    \
     2.7 -			    HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits)); \
     2.8 +			    BUG_ON(HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits))); \
     2.9  			} else {                                          \
    2.10                              xen_l1_entry_update((__ptep), (__entry)); \
    2.11  			    flush_tlb_page((__vma), (__address));         \
    2.12 @@ -416,8 +416,8 @@ do {				  					\
    2.13  #define ptep_establish_new(__vma, __address, __ptep, __entry)		\
    2.14  do {				  					\
    2.15  	if (likely((__vma)->vm_mm == current->mm)) {			\
    2.16 -		HYPERVISOR_update_va_mapping((__address),		\
    2.17 -					     __entry, 0);		\
    2.18 +		BUG_ON(HYPERVISOR_update_va_mapping((__address),	\
    2.19 +					     __entry, 0));		\
    2.20  	} else {							\
    2.21  		xen_l1_entry_update((__ptep), (__entry));	\
    2.22  	}								\