projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' into for-linus
[linux-2.6-microblaze.git]
/
kernel
/
entry
/
common.c
diff --git
a/kernel/entry/common.c
b/kernel/entry/common.c
index
1868359
..
6fdb610
100644
(file)
--- a/
kernel/entry/common.c
+++ b/
kernel/entry/common.c
@@
-60,13
+60,15
@@
static long syscall_trace_enter(struct pt_regs *regs, long syscall,
return ret;
}
return ret;
}
+ /* Either of the above might have changed the syscall number */
+ syscall = syscall_get_nr(current, regs);
+
if (unlikely(ti_work & _TIF_SYSCALL_TRACEPOINT))
trace_sys_enter(regs, syscall);
syscall_enter_audit(regs, syscall);
if (unlikely(ti_work & _TIF_SYSCALL_TRACEPOINT))
trace_sys_enter(regs, syscall);
syscall_enter_audit(regs, syscall);
- /* The above might have changed the syscall number */
- return ret ? : syscall_get_nr(current, regs);
+ return ret ? : syscall;
}
static __always_inline long
}
static __always_inline long