Merge branch 'next-queue' into next

9 files changed, 9 insertions, 18 deletions

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index e814d2109f8e..a98fb376f249 100644
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -170,12 +170,10 @@ static void keyring_describe(const struct key *keyring, struct seq_file *m)
 {
         struct keyring_list *klist;
 
-        if (keyring->description) {
+        if (keyring->description)
                 seq_puts(m, keyring->description);
-        }
-        else {
+        else
                 seq_puts(m, "[anon]");
-        }
 
         rcu_read_lock();
         klist = rcu_dereference(keyring->payload.subscriptions);
diff --git a/security/security.c b/security/security.c
index 687c6fd14bb6..b98334b0a576 100644
--- a/security/security.c
+++ b/security/security.c
@@ -117,7 +117,7 @@ int __init security_module_enable(struct security_operations *ops)
  * If there is already a security module registered with the kernel,
  * an error will be returned.  Otherwise %0 is returned on success.
  */
-int register_security(struct security_operations *ops)
+int __init register_security(struct security_operations *ops)
 {
         if (verify(ops)) {
                 printk(KERN_DEBUG "%s could not verify "
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 5feecb41009d..63c2d36d55ab 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -323,7 +323,7 @@ extern int ss_initialized;
 
 /* The file system's label must be initialized prior to use. */
 
-static char *labeling_behaviors[6] = {
+static const char *labeling_behaviors[6] = {
         "uses xattr",
         "uses transition SIDs",
         "uses task SIDs",
diff --git a/security/selinux/include/initial_sid_to_string.h b/security/selinux/include/initial_sid_to_string.h
index d4fac82793ae..a59b64e3fd02 100644
--- a/security/selinux/include/initial_sid_to_string.h
+++ b/security/selinux/include/initial_sid_to_string.h
@@ -1,5 +1,5 @@
 /* This file is automatically generated.  Do not edit. */
-static char *initial_sid_to_string[] =
+static const char *initial_sid_to_string[] =
 {
     "null",
     "kernel",
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index 1ae556446e65..7d7be296d876 100644
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@ -13,7 +13,6 @@
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
-#include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/selinux_netlink.h>
diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c
index dd7cc6de77f9..75ec0c6ebacd 100644
--- a/security/selinux/nlmsgtab.c
+++ b/security/selinux/nlmsgtab.c
@@ -11,7 +11,6 @@
  */
 #include <linux/types.h>
 #include <linux/kernel.h>
-#include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <linux/if.h>
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"
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index ff51f1026b57..8ccf12997378 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -1367,7 +1367,6 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
 {
         int pos;
         u8 bit;
-        const char *atmark = "";
         const char *filename;
         const u32 perm = ptr->perm | (((u32) ptr->perm_high) << 16);
 
@@ -1382,8 +1381,7 @@ static bool tomoyo_print_path_acl(struct tomoyo_io_buffer *head,
                         continue;
                 msg = tomoyo_path2keyword(bit);
                 pos = head->read_avail;
-                if (!tomoyo_io_printf(head, "allow_%s %s%s\n", msg,
-                                      atmark, filename))
+                if (!tomoyo_io_printf(head, "allow_%s %s\n", msg, filename))
                         goto out;
         }
         head->read_bit = 0;
@@ -1406,8 +1404,6 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
                                    struct tomoyo_path2_acl *ptr)
 {
         int pos;
-        const char *atmark1 = "";
-        const char *atmark2 = "";
         const char *filename1;
         const char *filename2;
         const u8 perm = ptr->perm;
@@ -1421,8 +1417,8 @@ static bool tomoyo_print_path2_acl(struct tomoyo_io_buffer *head,
                         continue;
                 msg = tomoyo_path22keyword(bit);
                 pos = head->read_avail;
-                if (!tomoyo_io_printf(head, "allow_%s %s%s %s%s\n", msg,
-                                      atmark1, filename1, atmark2, filename2))
+                if (!tomoyo_io_printf(head, "allow_%s %s %s\n", msg,
+                                      filename1, filename2))
                         goto out;
         }
         head->read_bit = 0;