[IA64] Fix vdso paravirtualization.

When on baremetal, xen address must not be referenced.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index f48f513145e5a46c3dc042d851b4c01f4b7204fb..579e30d92fdd56bd4c9f2463a5369f4c65e92c4a 100644 (file)
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -129,17 +129,17 @@ GLOBAL_ENTRY(__kernel_syscall_via_epc)
        LOAD_RUNNING_ON_XEN(r28)
        movl r22=XSI_PSR_I_ADDR
        ;;
-       ld8 r22=[r22]
-       ;;
        movl r23=XSI_PSR_IC
-       adds r24=-1,r22
        mov r20=1
        ;;
        ld4 r30=[r28]
        ;;
        cmp.ne isXen,isRaw=r0,r30
        ;;
+(isXen)        ld8 r22=[r22]
+       ;; 
 (isRaw)        rsm psr.be | psr.i
+(isXen)        adds r24=-1,r22
 (isXen)        st1 [r22]=r20
 (isXen)        rum psr.be
        ;;