ia64/xen-unstable

changeset 11722:3f3a818d56f5

[IA64] revert xen-ia64-unstable.hg cset 11039

No longer necessary with xencomm

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Wed Oct 04 22:11:34 2006 -0600 (2006-10-04)
parents 1ec09a35d13d
children 49bf2381e009
files xen/arch/ia64/xen/vcpu.c xen/include/asm-ia64/domain.h xen/include/asm-ia64/uaccess.h
line diff
     1.1 --- a/xen/arch/ia64/xen/vcpu.c	Tue Oct 03 14:46:10 2006 -0600
     1.2 +++ b/xen/arch/ia64/xen/vcpu.c	Wed Oct 04 22:11:34 2006 -0600
     1.3 @@ -2226,28 +2226,3 @@ IA64FAULT vcpu_ptr_i(VCPU *vcpu,UINT64 v
     1.4  
     1.5  	return IA64_NO_FAULT;
     1.6  }
     1.7 -
     1.8 -int ia64_map_hypercall_param(void)
     1.9 -{
    1.10 -	struct vcpu *v = current;
    1.11 -	struct domain *d = current->domain;
    1.12 -	u64 vaddr = v->arch.hypercall_param.va & PAGE_MASK;
    1.13 -	volatile pte_t* pte;
    1.14 -
    1.15 -	if (v->arch.hypercall_param.va == 0)
    1.16 -		return FALSE;
    1.17 -	pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa1);
    1.18 -	if (!pte || !pte_present(*pte))
    1.19 -		return FALSE;
    1.20 -	vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte), -1UL, PAGE_SHIFT);
    1.21 -	if (v->arch.hypercall_param.pa2) {
    1.22 -		vaddr += PAGE_SIZE;
    1.23 -		pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa2);
    1.24 -		if (pte && pte_present(*pte)) {
    1.25 -			vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte),
    1.26 -			                 -1UL, PAGE_SHIFT);
    1.27 -		}
    1.28 -	}
    1.29 -	ia64_srlz_d();
    1.30 -	return TRUE;
    1.31 -}
     2.1 --- a/xen/include/asm-ia64/domain.h	Tue Oct 03 14:46:10 2006 -0600
     2.2 +++ b/xen/include/asm-ia64/domain.h	Wed Oct 04 22:11:34 2006 -0600
     2.3 @@ -142,12 +142,6 @@ struct arch_domain {
     2.4      (sizeof(vcpu_info_t) * (v)->vcpu_id + \
     2.5      offsetof(vcpu_info_t, evtchn_upcall_mask))
     2.6  
     2.7 -struct hypercall_param {
     2.8 -    unsigned long va;
     2.9 -    unsigned long pa1;
    2.10 -    unsigned long pa2;
    2.11 -};
    2.12 -
    2.13  struct arch_vcpu {
    2.14      /* Save the state of vcpu.
    2.15         This is the first entry to speed up accesses.  */
    2.16 @@ -192,8 +186,6 @@ struct arch_vcpu {
    2.17      char irq_new_condition;    // vpsr.i/vtpr change, check for pending VHPI
    2.18      char hypercall_continuation;
    2.19  
    2.20 -    struct hypercall_param hypercall_param;  // used to remap a hypercall param
    2.21 -
    2.22      //for phycial  emulation
    2.23      unsigned long old_rsc;
    2.24      int mode_flags;
     3.1 --- a/xen/include/asm-ia64/uaccess.h	Tue Oct 03 14:46:10 2006 -0600
     3.2 +++ b/xen/include/asm-ia64/uaccess.h	Wed Oct 04 22:11:34 2006 -0600
     3.3 @@ -211,30 +211,16 @@ extern void __put_user_unknown (void);
     3.4  extern unsigned long __must_check __copy_user (void __user *to, const void __user *from,
     3.5  					       unsigned long count);
     3.6  
     3.7 -extern int ia64_map_hypercall_param(void);
     3.8 -
     3.9  static inline unsigned long
    3.10  __copy_to_user (void __user *to, const void *from, unsigned long count)
    3.11  {
    3.12 -	unsigned long len;
    3.13 -	len = __copy_user(to, (void __user *)from, count);
    3.14 -	if (len == 0)
    3.15 -		return 0;
    3.16 -	if (ia64_map_hypercall_param())
    3.17 -		len = __copy_user(to, (void __user *)from, count); /* retry */
    3.18 -	return len;
    3.19 +	return __copy_user(to, (void __user *)from, count);
    3.20  }
    3.21  
    3.22  static inline unsigned long
    3.23  __copy_from_user (void *to, const void __user *from, unsigned long count)
    3.24  {
    3.25 -	unsigned long len;
    3.26 -	len = __copy_user((void __user *)to, from, count);
    3.27 -	if (len == 0)
    3.28 -		return 0;
    3.29 -	if (ia64_map_hypercall_param())
    3.30 -		len = __copy_user((void __user *) to, from, count); /* retry */
    3.31 -	return len;
    3.32 +	return __copy_user((void __user *)to, from, count);
    3.33  }
    3.34  
    3.35  #define __copy_to_user_inatomic		__copy_to_user