aboutsummaryrefslogtreecommitdiffstats
path: root/security/device_cgroup.c
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-05-06 10:56:07 +1000
committerJames Morris <jmorris@namei.org>2010-05-06 10:56:07 +1000
commit0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch)
tree81b1a2305d16c873371b65c5a863c0268036cefe /security/device_cgroup.c
parent4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff)
parent7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff)
downloadmrst-s0i3-test-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.gz
mrst-s0i3-test-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz
mrst-s0i3-test-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.zip
Merge branch 'master' into next
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r--security/device_cgroup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 37c5af6ac49..8d9c48f1377 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -10,6 +10,7 @@
#include <linux/list.h>
#include <linux/uaccess.h>
#include <linux/seq_file.h>
+#include <linux/slab.h>
#include <linux/rcupdate.h>
#include <linux/mutex.h>