5 files changed, 9 insertions, 7 deletions

diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 0994948f3edc..2e2802060eef 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -262,13 +262,17 @@ static void tomoyo_set_string(struct tomoyo_io_buffer *head, const char *string)
                 WARN_ON(1);
 }
 
+static void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt,
+                             ...) __printf(2, 3);
+
 /**
  * tomoyo_io_printf - printf() to "struct tomoyo_io_buffer" structure.
  *
  * @head: Pointer to "struct tomoyo_io_buffer".
  * @fmt:  The printf()'s format string, followed by parameters.
  */
-void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
+static void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt,
+                             ...)
 {
         va_list args;
         size_t len;
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index a2bc33fc60b6..1a19ad3e67ea 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -978,8 +978,6 @@ int tomoyo_path_number_perm(const u8 operation, struct path *path,
                             unsigned long number);
 int tomoyo_path_perm(const u8 operation, struct path *path,
                      const char *target);
-int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
-                           const struct tomoyo_path_info *filename);
 int tomoyo_poll_control(struct file *file, poll_table *wait);
 int tomoyo_poll_log(struct file *file, poll_table *wait);
 int tomoyo_socket_bind_permission(struct socket *sock, struct sockaddr *addr,
@@ -1041,8 +1039,6 @@ void tomoyo_del_condition(struct list_head *element);
 void tomoyo_fill_path_info(struct tomoyo_path_info *ptr);
 void tomoyo_get_attributes(struct tomoyo_obj_info *obj);
 void tomoyo_init_policy_namespace(struct tomoyo_policy_namespace *ns);
-void tomoyo_io_printf(struct tomoyo_io_buffer *head, const char *fmt, ...)
-         __printf(2, 3);
 void tomoyo_load_policy(const char *filename);
 void tomoyo_memory_free(void *ptr);
 void tomoyo_normalize_line(unsigned char *buffer);
diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c
index 860390ee1fbe..70acf7aebbda 100644
--- a/security/tomoyo/domain.c
+++ b/security/tomoyo/domain.c
@@ -567,6 +567,7 @@ out:
                         tomoyo_write_log(&r, "use_profile %u\n",
                                          entry->profile);
                         tomoyo_write_log(&r, "use_group %u\n", entry->group);
+                        tomoyo_update_stat(TOMOYO_STAT_POLICY_UPDATES);
                 }
         }
         return entry;
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c
index b280c1bd652d..400390790745 100644
--- a/security/tomoyo/file.c
+++ b/security/tomoyo/file.c
@@ -555,8 +555,8 @@ static int tomoyo_update_path2_acl(const u8 perm,
  *
  * Caller holds tomoyo_read_lock().
  */
-int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
-                           const struct tomoyo_path_info *filename)
+static int tomoyo_path_permission(struct tomoyo_request_info *r, u8 operation,
+                                  const struct tomoyo_path_info *filename)
 {
         int error;
 
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c
index d08296a4882b..2672ac4f3beb 100644
--- a/security/tomoyo/securityfs_if.c
+++ b/security/tomoyo/securityfs_if.c
@@ -265,6 +265,7 @@ static int __init tomoyo_initerface_init(void)
                             TOMOYO_VERSION);
         securityfs_create_file("self_domain", 0666, tomoyo_dir, NULL,
                                &tomoyo_self_operations);
+        tomoyo_load_builtin_policy();
         return 0;
 }