4 files changed, 10 insertions, 10 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 02a60b8e503b..a790022055ca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6443,7 +6443,7 @@ L:	tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
 L:      tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
 L:      tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
 W:      http://tomoyo.sourceforge.jp/
-T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
+T:      quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.5.x/tomoyo-lsm/patches/
 S:      Maintained
 F:      security/tomoyo/
 
diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile
index fc2a8ce40301..56a0c7be409e 100644
--- a/security/tomoyo/Makefile
+++ b/security/tomoyo/Makefile
@@ -27,7 +27,7 @@ $(obj)/policy/stat.conf:
         @touch $@
 
 $(obj)/builtin-policy.h: $(obj)/policy/profile.conf $(obj)/policy/exception_policy.conf $(obj)/policy/domain_policy.conf $(obj)/policy/manager.conf $(obj)/policy/stat.conf
-        @echo Generating built-in policy for TOMOYO 2.4.x.
+        @echo Generating built-in policy for TOMOYO 2.5.x.
         @echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp
         @sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/profile.conf >> $@.tmp
         @echo "\"\";" >> $@.tmp
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 1fd0fc1059ba..084018351b4f 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -345,7 +345,7 @@ void tomoyo_init_policy_namespace(struct tomoyo_policy_namespace *ns)
                 INIT_LIST_HEAD(&ns->group_list[idx]);
         for (idx = 0; idx < TOMOYO_MAX_POLICY; idx++)
                 INIT_LIST_HEAD(&ns->policy_list[idx]);
-        ns->profile_version = 20100903;
+        ns->profile_version = 20110903;
         tomoyo_namespace_enabled = !list_empty(&tomoyo_namespace_list);
         list_add_tail_rcu(&ns->namespace_list, &tomoyo_namespace_list);
 }
@@ -2222,7 +2222,7 @@ static int tomoyo_write_answer(struct tomoyo_io_buffer *head)
 static void tomoyo_read_version(struct tomoyo_io_buffer *head)
 {
         if (!head->r.eof) {
-                tomoyo_io_printf(head, "2.4.0");
+                tomoyo_io_printf(head, "2.5.0");
                 head->r.eof = true;
         }
 }
@@ -2694,11 +2694,11 @@ void tomoyo_check_profile(void)
         struct tomoyo_domain_info *domain;
         const int idx = tomoyo_read_lock();
         tomoyo_policy_loaded = true;
-        printk(KERN_INFO "TOMOYO: 2.4.0\n");
+        printk(KERN_INFO "TOMOYO: 2.5.0\n");
         list_for_each_entry_rcu(domain, &tomoyo_domain_list, list) {
                 const u8 profile = domain->profile;
                 const struct tomoyo_policy_namespace *ns = domain->ns;
-                if (ns->profile_version != 20100903)
+                if (ns->profile_version != 20110903)
                         printk(KERN_ERR
                                "Profile version %u is not supported.\n",
                                ns->profile_version);
@@ -2709,9 +2709,9 @@ void tomoyo_check_profile(void)
                 else
                         continue;
                 printk(KERN_ERR
-                       "Userland tools for TOMOYO 2.4 must be installed and "
+                       "Userland tools for TOMOYO 2.5 must be installed and "
                        "policy must be initialized.\n");
-                printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.4/ "
+                printk(KERN_ERR "Please see http://tomoyo.sourceforge.jp/2.5/ "
                        "for more information.\n");
                 panic("STOP!");
         }
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index af82683df7ff..471c9f9afc18 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h
@@ -3,7 +3,7 @@
  *
  * Header file for TOMOYO.
  *
- * Copyright (C) 2005-2010  NTT DATA CORPORATION
+ * Copyright (C) 2005-2011  NTT DATA CORPORATION
  */
 
 #ifndef _SECURITY_TOMOYO_COMMON_H
@@ -901,7 +901,7 @@ struct tomoyo_policy_namespace {
         struct list_head acl_group[TOMOYO_MAX_ACL_GROUPS];
         /* List for connecting to tomoyo_namespace_list list. */
         struct list_head namespace_list;
-        /* Profile version. Currently only 20100903 is defined. */
+        /* Profile version. Currently only 20110903 is defined. */
         unsigned int profile_version;
         /* Name of this namespace (e.g. "<kernel>", "</usr/sbin/httpd>" ). */
         const char *name;