diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/smack | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
| download | op-kernel-dev-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.zip op-kernel-dev-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.gz | |
Merge branch 'master' into next
Diffstat (limited to 'security/smack')
| -rw-r--r-- | security/smack/smack_access.c | 1 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 1 | ||||
| -rw-r--r-- | security/smack/smackfs.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c index 0f9ac81..f4fac64 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c @@ -11,6 +11,7 @@ */ #include <linux/types.h> +#include <linux/slab.h> #include <linux/fs.h> #include <linux/sched.h> #include "smack.h" diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 2a20738..0f2fc48 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -24,6 +24,7 @@ #include <linux/ip.h> #include <linux/tcp.h> #include <linux/udp.h> +#include <linux/slab.h> #include <linux/mutex.h> #include <linux/pipe_fs_i.h> #include <net/netlabel.h> diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index aeead75..a2b72d7 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -20,6 +20,7 @@ #include <linux/vmalloc.h> #include <linux/security.h> #include <linux/mutex.h> +#include <linux/slab.h> #include <net/net_namespace.h> #include <net/netlabel.h> #include <net/cipso_ipv4.h> |
