# HG changeset patch # User yamahata@xxxxxxxxxxxxx # Date 1184061747 -32400 # Node ID b388e6fecd69247ecf740d0576119fc024c76cce # Parent 28aaf94683193e2e50c3d4efd53abb913b7bb321 fix vdso paravirtualization. When on baremetal, xen address must not be referenced. PATCHNAME: fix_vdso Signed-off-by: Isaku Yamahata diff -r 28aaf9468319 -r b388e6fecd69 arch/ia64/kernel/gate.S --- a/arch/ia64/kernel/gate.S Fri Jul 13 17:25:40 2007 +0900 +++ b/arch/ia64/kernel/gate.S Tue Jul 10 19:02:27 2007 +0900 @@ -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 ;;