aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-18 20:16:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-18 20:16:02 -0700
commit932e9f352b5d685725076f21b237f7c7d804b29c (patch)
tree02ee87c6174bc8a8ada8990fa6786a97b98802c7
parentdbfad21422f8d2c0866185b3e449c4a6ebaec4e2 (diff)
parent51b79bee627d526199b2f6a6bef8ee0c0739b6d1 (diff)
downloadxen-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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c
index 0ecf4ba321cbea..71a166a05975bf 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