1.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Mon Nov 29 18:57:17 2004 +0000
     1.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/pgtable.h	Tue Nov 30 09:01:47 2004 +0000
     1.3 @@ -421,31 +421,19 @@ extern pte_t *lookup_address(unsigned lo
     1.4  #define update_mmu_cache(vma,address,pte) do { } while (0)
     1.5  #define  __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
     1.6  
     1.7 -#if 0
     1.8  #define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
     1.9  	do {								  \
    1.10  		if (__dirty) {						  \
    1.11 -			queue_l1_entry_update((__ptep), (__entry).pte_low); \
    1.12 -			flush_tlb_page(__vma, __address);                 \
    1.13 -			xen_flush_page_update_queue();                    \
    1.14 -		}							  \
    1.15 -	} while (0)
    1.16 -#else
    1.17 -#define ptep_set_access_flags(__vma, __address, __ptep, __entry, __dirty) \
    1.18 -	do {								  \
    1.19 -		if (__dirty) {						  \
    1.20 -		        if ( likely(vma->vm_mm == current->mm) ) {        \
    1.21 +		        if ( likely((__vma)->vm_mm == current->mm) ) {    \
    1.22  			    xen_flush_page_update_queue();                \
    1.23 -			    HYPERVISOR_update_va_mapping(address>>PAGE_SHIFT, entry, UVMF_INVLPG); \
    1.24 +			    HYPERVISOR_update_va_mapping((__address)>>PAGE_SHIFT, (__entry), UVMF_INVLPG); \
    1.25  			} else {                                          \
    1.26                              xen_l1_entry_update((__ptep), (__entry).pte_low); \
    1.27 -			    flush_tlb_page(__vma, __address);             \
    1.28 +			    flush_tlb_page((__vma), (__address));         \
    1.29  			}                                                 \
    1.30  		}							  \
    1.31  	} while (0)
    1.32  
    1.33 -#endif
    1.34 -
    1.35  #define __HAVE_ARCH_PTEP_ESTABLISH
    1.36  #define ptep_establish(__vma, __address, __ptep, __entry)		\
    1.37  do {				  					\