diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 20:16:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-18 20:16:02 -0700 |
commit | 932e9f352b5d685725076f21b237f7c7d804b29c (patch) | |
tree | 02ee87c6174bc8a8ada8990fa6786a97b98802c7 | |
parent | dbfad21422f8d2c0866185b3e449c4a6ebaec4e2 (diff) | |
parent | 51b79bee627d526199b2f6a6bef8ee0c0739b6d1 (diff) | |
download | op-kernel-dev-932e9f352b5d685725076f21b237f7c7d804b29c.zip op-kernel-dev-932e9f352b5d685725076f21b237f7c7d804b29c.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security: fix compile error in commoncap.c
-rw-r--r-- | security/commoncap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 0ecf4ba..71a166a 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -29,6 +29,7 @@ #include <linux/securebits.h> #include <linux/user_namespace.h> #include <linux/binfmts.h> +#include <linux/personality.h> /* * If a non-root user executes a setuid-root binary in |