diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 09:39:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-05 09:39:11 -0700 |
| commit | b66696e3c0d8fc01efdbc701eba1276618332cb3 (patch) | |
| tree | 3094ef42787b8e0c900bce1f2391ced081ed1ba4 /security/smack | |
| parent | 9e74e7c81a24aee66024fc477786bd1de84e293b (diff) | |
| parent | a32f3926632e71c8aa23ce32fe2625f8d5f792c2 (diff) | |
Merge branch 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc
* 'slabh' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc:
eeepc-wmi: include slab.h
staging/otus: include slab.h from usbdrv.h
percpu: don't implicitly include slab.h from percpu.h
kmemcheck: Fix build errors due to missing slab.h
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
iwlwifi: don't include iwl-dev.h from iwl-devtrace.h
x86: don't include slab.h from arch/x86/include/asm/pgtable_32.h
Fix up trivial conflicts in include/linux/percpu.h due to
is_kernel_percpu_address() having been introduced since the slab.h
cleanup with the percpu_up.c splitup.
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 @@ */ #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 5225e668dbf..fdfeaa2f28e 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -25,6 +25,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 aeead758509..a2b72d77f92 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> |