diff options
| author | James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-09 12:46:47 +1100 |
| commit | c43a7523470dc2d9947fa114a0b54317975d4c04 (patch) | |
| tree | 30a72ed1e9079f19b814263197761820f57c39ce /security/selinux/ss | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | 634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff) | |
| download | linux-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.bz2 | |
Merge branch 'next-queue' into next
Diffstat (limited to 'security/selinux/ss')
| -rw-r--r-- | security/selinux/ss/policydb.c | 2 | ||||
| -rw-r--r-- | security/selinux/ss/symtab.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 23c6e53c102c..24ced65ac4ff 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c @@ -40,7 +40,7 @@ #define _DEBUG_HASHES #ifdef DEBUG_HASHES -static char *symtab_name[SYM_NUM] = { +static const char *symtab_name[SYM_NUM] = { "common prefixes", "classes", "roles", diff --git a/security/selinux/ss/symtab.c b/security/selinux/ss/symtab.c index 837658a98a54..bcf9f620426e 100644 --- a/security/selinux/ss/symtab.c +++ b/security/selinux/ss/symtab.c @@ -4,7 +4,6 @@ * Author : Stephen Smalley, <sds@epoch.ncsc.mil> */ #include <linux/kernel.h> -#include <linux/slab.h> #include <linux/string.h> #include <linux/errno.h> #include "symtab.h" |