diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-12 09:51:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-12 09:51:18 +0200 |
| commit | b9f27c0f4f7db9e5a4ba59228442a75d3177470c (patch) | |
| tree | 49ab61b7e06a5a592f3541e84d1b5908a1d8030f /include/linux/security.h | |
| parent | 9fc4468d546b6eb55b0aa5b04b0c36238ebf57e7 (diff) | |
| parent | 25cb62b76430a91cc6195f902e61c2cb84ade622 (diff) | |
| download | kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.gz kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.tar.bz2 kernel_replicant_linux-b9f27c0f4f7db9e5a4ba59228442a75d3177470c.zip | |
Merge tag 'v4.3-rc5' into timers/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) |