aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorDavid Mosberger-Tang <davidm@hpl.hp.com>2005-05-05 06:40:00 -0700
committerTony Luck <tony.luck@intel.com>2005-05-05 11:30:48 -0700
commitebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (patch)
tree74ceae4d7d8898050ab1d8b78f70fdd05906c89d /arch/ia64
parent[IA64] need r29=psr *after* rsm psr.i (diff)
downloadlinux-dev-ebcc80c1b6629a445f7471cc1ddb48faf8a84e70.tar.xz
linux-dev-ebcc80c1b6629a445f7471cc1ddb48faf8a84e70.zip
[IA64] Merge audit fix for fsyscalls with syscall-optimizations
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/fsys.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index d09a5b8a0982..f566ff43a389 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -630,10 +630,10 @@ GLOBAL_ENTRY(fsys_bubble_down)
;;
mov ar.rsc=0x3 // M2 set eager mode, pl 0, LE, loadrs=0
mov rp=r14 // I0 set the real return addr
- nop.i 0
+ and r3=_TIF_SYSCALL_TRACEAUDIT,r3 // A
;;
ssm psr.i // M2 we're on kernel stacks now, reenable irqs
- tbit.z p8,p0=r3,TIF_SYSCALL_TRACE // I0
+ cmp.eq p8,p0=r3,r0 // A
(p10) br.cond.spnt.many ia64_ret_from_syscall // B return if bad call-frame or r15 is a NaT
nop.m 0