diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/keys/key.c | 2 | ||||
-rw-r--r-- | security/selinux/avc.c | 2 | ||||
-rw-r--r-- | security/selinux/hooks.c | 2 | ||||
-rw-r--r-- | security/selinux/ss/avtab.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 157bac658bf9..0db816f10f85 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
21 | #include "internal.h" | 21 | #include "internal.h" |
22 | 22 | ||
23 | static kmem_cache_t *key_jar; | 23 | static struct kmem_cache *key_jar; |
24 | struct rb_root key_serial_tree; /* tree of keys indexed by serial */ | 24 | struct rb_root key_serial_tree; /* tree of keys indexed by serial */ |
25 | DEFINE_SPINLOCK(key_serial_lock); | 25 | DEFINE_SPINLOCK(key_serial_lock); |
26 | 26 | ||
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 65b4ec9c699a..e7c0b5e2066b 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
@@ -124,7 +124,7 @@ DEFINE_PER_CPU(struct avc_cache_stats, avc_cache_stats) = { 0 }; | |||
124 | 124 | ||
125 | static struct avc_cache avc_cache; | 125 | static struct avc_cache avc_cache; |
126 | static struct avc_callback_node *avc_callbacks; | 126 | static struct avc_callback_node *avc_callbacks; |
127 | static kmem_cache_t *avc_node_cachep; | 127 | static struct kmem_cache *avc_node_cachep; |
128 | 128 | ||
129 | static inline int avc_hash(u32 ssid, u32 tsid, u16 tclass) | 129 | static inline int avc_hash(u32 ssid, u32 tsid, u16 tclass) |
130 | { | 130 | { |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index ac1aeed0b289..44e9cd470543 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
@@ -124,7 +124,7 @@ static struct security_operations *secondary_ops = NULL; | |||
124 | static LIST_HEAD(superblock_security_head); | 124 | static LIST_HEAD(superblock_security_head); |
125 | static DEFINE_SPINLOCK(sb_security_lock); | 125 | static DEFINE_SPINLOCK(sb_security_lock); |
126 | 126 | ||
127 | static kmem_cache_t *sel_inode_cache; | 127 | static struct kmem_cache *sel_inode_cache; |
128 | 128 | ||
129 | /* Return security context for a given sid or just the context | 129 | /* Return security context for a given sid or just the context |
130 | length if the buffer is null or length is 0 */ | 130 | length if the buffer is null or length is 0 */ |
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 2dfc6134c2c2..ebb993c5c244 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
@@ -28,7 +28,7 @@ | |||
28 | (keyp->source_type << 9)) & \ | 28 | (keyp->source_type << 9)) & \ |
29 | AVTAB_HASH_MASK) | 29 | AVTAB_HASH_MASK) |
30 | 30 | ||
31 | static kmem_cache_t *avtab_node_cachep; | 31 | static struct kmem_cache *avtab_node_cachep; |
32 | 32 | ||
33 | static struct avtab_node* | 33 | static struct avtab_node* |
34 | avtab_insert_node(struct avtab *h, int hvalue, | 34 | avtab_insert_node(struct avtab *h, int hvalue, |