diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-23 10:52:03 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-23 10:52:03 +0300 |
| commit | 4bbffe718fe1bfae6176a6fb783c1576b69338e5 (patch) | |
| tree | e4d25102f0d2fa2a3480e03ba7bde45c9958511e /include/linux/security.h | |
| parent | ac742d37180bee83bc433be087b66a17af2883b9 (diff) | |
| parent | 21199f27b430576552b26210b3194a363d7f05cd (diff) | |
| download | linux-4bbffe718fe1bfae6176a6fb783c1576b69338e5.tar.xz | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 79d85ddf8093..2f4c1f7aa7db 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -946,7 +946,7 @@ static inline int security_task_prctl(int option, unsigned long arg2, unsigned long arg4, unsigned long arg5) { - return cap_task_prctl(option, arg2, arg3, arg3, arg5); + return cap_task_prctl(option, arg2, arg3, arg4, arg5); } static inline void security_task_to_inode(struct task_struct *p, struct inode *inode) |