ia64/xen-unstable

changeset 6153:1de047fc56f5

merge
author iap10@freefall.cl.cam.ac.uk
date Sat Aug 13 21:03:39 2005 +0000 (2005-08-13)
parents 8864f0be80c6 a8a88f85a3e6
children 323a46d272ff
files .hgignore linux-2.6-xen-sparse/arch/xen/i386/mm/hypervisor.c linux-2.6-xen-sparse/arch/xen/i386/mm/pgtable.c linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/blkback/interface.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c linux-2.6-xen-sparse/include/asm-xen/asm-i386/hypercall.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/pgtable.h tools/libxc/Makefile tools/libxc/xc_core.c tools/libxc/xc_gnttab.c tools/libxc/xc_linux_build.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c tools/libxc/xc_load_elf.c tools/libxc/xc_ptrace.c tools/libxc/xc_vmx_build.c tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/server/controller.py tools/xenstore/xenstored_core.c xen/Rules.mk xen/arch/ia64/grant_table.c xen/arch/x86/mm.c xen/arch/x86/setup.c xen/arch/x86/traps.c xen/common/grant_table.c xen/common/perfc.c xen/include/asm-x86/mm.h xen/include/public/grant_table.h xen/include/xen/grant_table.h
line diff
     9.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Sat Aug 13 20:49:29 2005 +0000
     9.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgalloc.h	Sat Aug 13 21:03:39 2005 +0000
     9.3 @@ -14,9 +14,9 @@
     9.4  do {									\
     9.5  	if (unlikely((mm)->context.pinned)) {				\
     9.6  		if (!PageHighMem(pte))					\
     9.7 -			HYPERVISOR_update_va_mapping(			\
     9.8 +			BUG_ON(HYPERVISOR_update_va_mapping(		\
     9.9  			  (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT),\
    9.10 -			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0);\
    9.11 +			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0));\
    9.12  		set_pmd(pmd, __pmd(_PAGE_TABLE +			\
    9.13  			((unsigned long long)page_to_pfn(pte) <<	\
    9.14  				(unsigned long long) PAGE_SHIFT)));	\
    10.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Sat Aug 13 20:49:29 2005 +0000
    10.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Sat Aug 13 21:03:39 2005 +0000
    10.3 @@ -398,7 +398,7 @@ extern void noexec_setup(const char *str
    10.4  	do {								  \
    10.5  		if (__dirty) {						  \
    10.6  		        if ( likely((__vma)->vm_mm == current->mm) ) {    \
    10.7 -			    HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits)); \
    10.8 +			    BUG_ON(HYPERVISOR_update_va_mapping((__address), (__entry), UVMF_INVLPG|UVMF_MULTI|(unsigned long)((__vma)->vm_mm->cpu_vm_mask.bits))); \
    10.9  			} else {                                          \
   10.10                              xen_l1_entry_update((__ptep), (__entry)); \
   10.11  			    flush_tlb_page((__vma), (__address));         \
   10.12 @@ -416,8 +416,8 @@ do {				  					\
   10.13  #define ptep_establish_new(__vma, __address, __ptep, __entry)		\
   10.14  do {				  					\
   10.15  	if (likely((__vma)->vm_mm == current->mm)) {			\
   10.16 -		HYPERVISOR_update_va_mapping((__address),		\
   10.17 -					     __entry, 0);		\
   10.18 +		BUG_ON(HYPERVISOR_update_va_mapping((__address),	\
   10.19 +					     __entry, 0));		\
   10.20  	} else {							\
   10.21  		xen_l1_entry_update((__ptep), (__entry));	\
   10.22  	}								\