projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[linux-2.6-block.git]
/
include
/
linux
/
security.h
diff --git
a/include/linux/security.h
b/include/linux/security.h
index 79d85ddf8093c892b3797bd5f8c8bca391f1d5e8..2f4c1f7aa7db7076998762d2772a35c6e16f9547 100644
(file)
--- 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, arg
3
, arg5);
+ return cap_task_prctl(option, arg2, arg3, arg
4
, arg5);
}
static inline void security_task_to_inode(struct task_struct *p, struct inode *inode)