aboutsummaryrefslogtreecommitdiffstats
path: root/security/selinux/ss
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2010-03-09 12:46:47 +1100
committerJames Morris <jmorris@namei.org>2010-03-09 12:46:47 +1100
commitc43a7523470dc2d9947fa114a0b54317975d4c04 (patch)
tree30a72ed1e9079f19b814263197761820f57c39ce /security/selinux/ss
parenteaa5eec739637f32f8733d528ff0b94fd62b1214 (diff)
parent634a539e16bd7a1ba31c3f832baa725565cc9f96 (diff)
downloadmrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.gz
mrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.tar.xz
mrst-s0i3-test-c43a7523470dc2d9947fa114a0b54317975d4c04.zip
Merge branch 'next-queue' into next
Diffstat (limited to 'security/selinux/ss')
-rw-r--r--security/selinux/ss/policydb.c2
-rw-r--r--security/selinux/ss/symtab.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 23c6e53c102..24ced65ac4f 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 837658a98a5..bcf9f620426 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"