ia64/xen-unstable

changeset 16116:2863852e02f6

[IA64] Cleanup of hypercall leave path.

p9 is set, but not used.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author Alex Williamson <alex.williamson@hp.com>
date Mon Oct 15 11:41:28 2007 -0600 (2007-10-15)
parents cd889a7ccae4
children ab89a931f94f
files xen/arch/ia64/linux-xen/entry.S xen/arch/ia64/vmx/vmx_entry.S
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/entry.S	Mon Oct 15 11:39:30 2007 -0600
     1.2 +++ b/xen/arch/ia64/linux-xen/entry.S	Mon Oct 15 11:41:28 2007 -0600
     1.3 @@ -787,7 +787,9 @@ ENTRY(ia64_leave_syscall)
     1.4  	;;
     1.5  	invala			// M0|1 invalidate ALAT
     1.6  	rsm psr.i | psr.ic	// M2   turn off interrupts and interruption collection
     1.7 +#ifndef XEN
     1.8  	cmp.eq p9,p0=r0,r0	// A    set p9 to indicate that we should restore cr.ifs
     1.9 +#endif
    1.10  
    1.11  	ld8 r29=[r2],16		// M0|1 load cr.ipsr
    1.12  	ld8 r28=[r3],16		// M0|1 load cr.iip
    1.13 @@ -1041,7 +1043,9 @@ GLOBAL_ENTRY(ia64_leave_kernel)
    1.14  	;;
    1.15  	ld8 r26=[r16],16	// load ar.pfs
    1.16  	ld8 r27=[r17],16	// load ar.rsc
    1.17 +#ifndef XEN	
    1.18  	cmp.eq p9,p0=r0,r0	// set p9 to indicate that we should restore cr.ifs
    1.19 +#endif
    1.20  	;;
    1.21  	ld8 r24=[r16],16	// load ar.rnat (may be garbage)
    1.22  	ld8 r23=[r17],16	// load ar.bspstore (may be garbage)
    1.23 @@ -1088,7 +1092,9 @@ GLOBAL_ENTRY(ia64_leave_kernel)
    1.24  	mov r19=ar.bsp			// get new backing store pointer
    1.25  rbs_switch:
    1.26  	sub r16=r16,r18			// krbs = old bsp - size of dirty partition
    1.27 +#ifndef XEN
    1.28  	cmp.ne p9,p0=r0,r0		// clear p9 to skip restore of cr.ifs
    1.29 +#endif
    1.30  	;;
    1.31  	sub r19=r19,r16			// calculate total byte size of dirty partition
    1.32  	add r18=64,r18			// don't force in0-in7 into memory...
     2.1 --- a/xen/arch/ia64/vmx/vmx_entry.S	Mon Oct 15 11:39:30 2007 -0600
     2.2 +++ b/xen/arch/ia64/vmx/vmx_entry.S	Mon Oct 15 11:41:28 2007 -0600
     2.3 @@ -112,7 +112,9 @@ GLOBAL_ENTRY(ia64_leave_nested)
     2.4  	;;
     2.5  	ld8 r26=[r16],16	// load ar.pfs
     2.6  	ld8 r27=[r17],16	// load ar.rsc
     2.7 +#ifndef XEN
     2.8  	cmp.eq p9,p0=r0,r0	// set p9 to indicate that we should restore cr.ifs
     2.9 +#endif
    2.10  	;;
    2.11  	ld8 r24=[r16],16	// load ar.rnat (may be garbage)
    2.12  	ld8 r23=[r17],16// load ar.bspstore (may be garbage)
    2.13 @@ -530,7 +532,9 @@ GLOBAL_ENTRY(ia64_leave_hypercall)
    2.14      ;;
    2.15      invala			// M0|1 invalidate ALAT
    2.16      rsm psr.i | psr.ic	// M2   turn off interrupts and interruption collection
    2.17 +#ifndef XEN
    2.18      cmp.eq p9,p0=r0,r0	// A    set p9 to indicate that we should restore cr.ifs
    2.19 +#endif
    2.20  
    2.21      ld8 r31=[r2],32		// M0|1 load cr.ipsr
    2.22      ld8 r30=[r3],16		// M0|1 load cr.iip