1.1 --- a/xen/arch/ia64/vmx/vmx_entry.S	Thu Jan 25 14:58:41 2007 -0700
     1.2 +++ b/xen/arch/ia64/vmx/vmx_entry.S	Fri Jan 26 14:11:21 2007 -0700
     1.3 @@ -425,148 +425,6 @@ ia64_vmm_entry_out:
     1.4  END(ia64_vmm_entry)
     1.5  
     1.6  
     1.7 -#ifdef XEN_DBL_MAPPING  /* will be removed */
     1.8 -
     1.9 -#define VMX_PURGE_RR7	0
    1.10 -#define VMX_INSERT_RR7	1
    1.11 -/*
    1.12 - * in0: old rr7
    1.13 - * in1: virtual address of xen image
    1.14 - * in2: virtual address of vhpt table
    1.15 - */
    1.16 -GLOBAL_ENTRY(vmx_purge_double_mapping)
    1.17 -    alloc loc1 = ar.pfs,5,9,0,0
    1.18 -    mov loc0 = rp
    1.19 -    movl r8 = 1f
    1.20 -    ;;
    1.21 -    movl loc4 = KERNEL_TR_PAGE_SHIFT
    1.22 -    movl loc5 = VCPU_TLB_SHIFT
    1.23 -    mov loc6 = psr
    1.24 -    movl loc7 = XEN_RR7_SWITCH_STUB
    1.25 -    mov loc8 = (1<<VMX_PURGE_RR7)
    1.26 -    ;;
    1.27 -    srlz.i
    1.28 -    ;;
    1.29 -    rsm psr.i | psr.ic
    1.30 -    ;;
    1.31 -    srlz.i
    1.32 -    ;;
    1.33 -    mov ar.rsc = 0
    1.34 -    mov b6 = loc7
    1.35 -    mov rp = r8
    1.36 -    ;;
    1.37 -    br.sptk b6
    1.38 -1:
    1.39 -    mov ar.rsc = 3
    1.40 -    mov rp = loc0
    1.41 -    ;;
    1.42 -    mov psr.l = loc6
    1.43 -    ;;
    1.44 -    srlz.i
    1.45 -    ;;
    1.46 -    br.ret.sptk rp
    1.47 -END(vmx_purge_double_mapping)
    1.48 -
    1.49 -/*
    1.50 - * in0: new rr7
    1.51 - * in1: virtual address of xen image
    1.52 - * in2: virtual address of vhpt table
    1.53 - * in3: pte entry of xen image
    1.54 - * in4: pte entry of vhpt table
    1.55 - */
    1.56 -GLOBAL_ENTRY(vmx_insert_double_mapping)
    1.57 -    alloc loc1 = ar.pfs,5,9,0,0
    1.58 -    mov loc0 = rp
    1.59 -    movl loc2 = IA64_TR_XEN_IN_DOM // TR number for xen image
    1.60 -    ;;
    1.61 -    movl loc3 = IA64_TR_VHPT_IN_DOM	// TR number for vhpt table
    1.62 -    movl r8 = 1f
    1.63 -    movl loc4 = KERNEL_TR_PAGE_SHIFT
    1.64 -    ;;
    1.65 -    movl loc5 = VCPU_TLB_SHIFT
    1.66 -    mov loc6 = psr
    1.67 -    movl loc7 = XEN_RR7_SWITCH_STUB
    1.68 -    ;;
    1.69 -    srlz.i
    1.70 -    ;;
    1.71 -    rsm psr.i | psr.ic
    1.72 -    mov loc8 = (1<<VMX_INSERT_RR7)
    1.73 -    ;;
    1.74 -    srlz.i
    1.75 -    ;;
    1.76 -    mov ar.rsc = 0
    1.77 -    mov b6 = loc7
    1.78 -    mov rp = r8
    1.79 -    ;;
    1.80 -    br.sptk b6
    1.81 -1:
    1.82 -    mov ar.rsc = 3
    1.83 -    mov rp = loc0
    1.84 -    ;;
    1.85 -    mov psr.l = loc6
    1.86 -    ;;
    1.87 -    srlz.i
    1.88 -    ;;
    1.89 -    br.ret.sptk rp
    1.90 -END(vmx_insert_double_mapping)
    1.91 -
    1.92 -    .align PAGE_SIZE
    1.93 -/*
    1.94 - * Stub to add double mapping for new domain, which shouldn't
    1.95 - * access any memory when active. Before reaching this point,
    1.96 - * both psr.i/ic is cleared and rse is set in lazy mode.
    1.97 - *
    1.98 - * in0: new rr7
    1.99 - * in1: virtual address of xen image
   1.100 - * in2: virtual address of vhpt table
   1.101 - * in3: pte entry of xen image
   1.102 - * in4: pte entry of vhpt table
   1.103 - * loc2: TR number for xen image
   1.104 - * loc3: TR number for vhpt table
   1.105 - * loc4: page size for xen image
   1.106 - * loc5: page size of vhpt table
   1.107 - * loc7: free to use
   1.108 - * loc8: purge or insert
   1.109 - * r8: will contain old rid value
   1.110 - */
   1.111 -GLOBAL_ENTRY(vmx_switch_rr7)
   1.112 -    movl loc7 = (7<<61)
   1.113 -    dep.z loc4 = loc4, 2, 6
   1.114 -    dep.z loc5 = loc5, 2, 6
   1.115 -    ;;
   1.116 -    tbit.nz p6,p7=loc8, VMX_INSERT_RR7
   1.117 -    mov r8 = rr[loc7]
   1.118 -    ;;
   1.119 -    mov rr[loc7] = in0
   1.120 -(p6)mov cr.ifa = in1
   1.121 -(p6)mov cr.itir = loc4
   1.122 -    ;;
   1.123 -    srlz.i
   1.124 -    ;;
   1.125 -(p6)itr.i itr[loc2] = in3
   1.126 -(p7)ptr.i in1, loc4
   1.127 -    ;;
   1.128 -(p6)itr.d dtr[loc2] = in3
   1.129 -(p7)ptr.d in1, loc4
   1.130 -    ;;
   1.131 -    srlz.i
   1.132 -    ;;
   1.133 -(p6)mov cr.ifa = in2
   1.134 -(p6)mov cr.itir = loc5
   1.135 -    ;;
   1.136 -(p6)itr.d dtr[loc3] = in4
   1.137 -(p7)ptr.d in2, loc5
   1.138 -    ;;
   1.139 -    srlz.i
   1.140 -    ;;
   1.141 -    mov rr[loc7] = r8
   1.142 -    ;;
   1.143 -    srlz.i
   1.144 -    br.sptk rp
   1.145 -END(vmx_switch_rr7)
   1.146 -    .align PAGE_SIZE
   1.147 -
   1.148 -#else
   1.149  /*
   1.150   * in0: new rr7
   1.151   * in1: virtual address of shared_info
   1.152 @@ -707,5 +565,3 @@ 1:
   1.153     srlz.d              // seralize restoration of psr.l
   1.154     br.ret.sptk.many rp
   1.155  END(vmx_switch_rr7)
   1.156 -#endif
   1.157 -