WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-ia64-devel

[Xen-ia64-devel] [PATCH] revert cset 11039

To: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-ia64-devel] [PATCH] revert cset 11039
From: Kouya SHIMURA <kouya@xxxxxxxxxxxxxx>
Date: Tue, 3 Oct 2006 18:51:24 +0900
Delivery-date: Tue, 03 Oct 2006 02:51:54 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ia64-devel-request@lists.xensource.com?subject=help>
List-id: Discussion of the ia64 port of Xen <xen-ia64-devel.lists.xensource.com>
List-post: <mailto:xen-ia64-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
Hi,

I'm grad that xencomm is applied.
Attached patch reverts cset 11039. 
That is no longer necessary.

Thanks,
Kouya

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>

diff -r 6e7cc23ab18c xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Mon Oct 02 21:53:07 2006 -0600
+++ b/xen/arch/ia64/xen/vcpu.c  Tue Oct 03 18:24:23 2006 +0900
@@ -2226,28 +2226,3 @@ IA64FAULT vcpu_ptr_i(VCPU *vcpu,UINT64 v
 
        return IA64_NO_FAULT;
 }
-
-int ia64_map_hypercall_param(void)
-{
-       struct vcpu *v = current;
-       struct domain *d = current->domain;
-       u64 vaddr = v->arch.hypercall_param.va & PAGE_MASK;
-       volatile pte_t* pte;
-
-       if (v->arch.hypercall_param.va == 0)
-               return FALSE;
-       pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa1);
-       if (!pte || !pte_present(*pte))
-               return FALSE;
-       vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte), -1UL, PAGE_SHIFT);
-       if (v->arch.hypercall_param.pa2) {
-               vaddr += PAGE_SIZE;
-               pte = lookup_noalloc_domain_pte(d, v->arch.hypercall_param.pa2);
-               if (pte && pte_present(*pte)) {
-                       vcpu_itc_no_srlz(v, 2, vaddr, pte_val(*pte),
-                                        -1UL, PAGE_SHIFT);
-               }
-       }
-       ia64_srlz_d();
-       return TRUE;
-}
diff -r 6e7cc23ab18c xen/include/asm-ia64/domain.h
--- a/xen/include/asm-ia64/domain.h     Mon Oct 02 21:53:07 2006 -0600
+++ b/xen/include/asm-ia64/domain.h     Tue Oct 03 18:24:23 2006 +0900
@@ -142,12 +142,6 @@ struct arch_domain {
     (sizeof(vcpu_info_t) * (v)->vcpu_id + \
     offsetof(vcpu_info_t, evtchn_upcall_mask))
 
-struct hypercall_param {
-    unsigned long va;
-    unsigned long pa1;
-    unsigned long pa2;
-};
-
 struct arch_vcpu {
     /* Save the state of vcpu.
        This is the first entry to speed up accesses.  */
@@ -192,8 +186,6 @@ struct arch_vcpu {
     char irq_new_condition;    // vpsr.i/vtpr change, check for pending VHPI
     char hypercall_continuation;
 
-    struct hypercall_param hypercall_param;  // used to remap a hypercall param
-
     //for phycial  emulation
     unsigned long old_rsc;
     int mode_flags;
diff -r 6e7cc23ab18c xen/include/asm-ia64/uaccess.h
--- a/xen/include/asm-ia64/uaccess.h    Mon Oct 02 21:53:07 2006 -0600
+++ b/xen/include/asm-ia64/uaccess.h    Tue Oct 03 18:24:23 2006 +0900
@@ -211,30 +211,16 @@ extern unsigned long __must_check __copy
 extern unsigned long __must_check __copy_user (void __user *to, const void 
__user *from,
                                               unsigned long count);
 
-extern int ia64_map_hypercall_param(void);
-
 static inline unsigned long
 __copy_to_user (void __user *to, const void *from, unsigned long count)
 {
-       unsigned long len;
-       len = __copy_user(to, (void __user *)from, count);
-       if (len == 0)
-               return 0;
-       if (ia64_map_hypercall_param())
-               len = __copy_user(to, (void __user *)from, count); /* retry */
-       return len;
+       return __copy_user(to, (void __user *)from, count);
 }
 
 static inline unsigned long
 __copy_from_user (void *to, const void __user *from, unsigned long count)
 {
-       unsigned long len;
-       len = __copy_user((void __user *)to, from, count);
-       if (len == 0)
-               return 0;
-       if (ia64_map_hypercall_param())
-               len = __copy_user((void __user *) to, from, count); /* retry */
-       return len;
+       return __copy_user((void __user *)to, from, count);
 }
 
 #define __copy_to_user_inatomic                __copy_to_user
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
<Prev in Thread] Current Thread [Next in Thread>