diff options
| author | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-05 20:56:07 -0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/smack | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
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 0f9ac814690..f4fac64c4da 100644 --- a/security/smack/smack_access.c +++ b/security/smack/smack_access.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 15 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 16 | #include "smack.h" | 17 | #include "smack.h" |
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 2a20738e7ea..0f2fc480fc6 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/ip.h> | 24 | #include <linux/ip.h> |
| 25 | #include <linux/tcp.h> | 25 | #include <linux/tcp.h> |
| 26 | #include <linux/udp.h> | 26 | #include <linux/udp.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 28 | #include <linux/pipe_fs_i.h> | 29 | #include <linux/pipe_fs_i.h> |
| 29 | #include <net/netlabel.h> | 30 | #include <net/netlabel.h> |
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index aeead758509..a2b72d77f92 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
| 21 | #include <linux/security.h> | 21 | #include <linux/security.h> |
| 22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <net/net_namespace.h> | 24 | #include <net/net_namespace.h> |
| 24 | #include <net/netlabel.h> | 25 | #include <net/netlabel.h> |
| 25 | #include <net/cipso_ipv4.h> | 26 | #include <net/cipso_ipv4.h> |