Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e6f6a4cc955d626ed26562d98de5766bf1f73526

Authored by Tetsuo Handa
Committed by James Morris
1 parent 7e3d199a40
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

TOMOYO: Update version to 2.3.0 

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: James Morris <jmorris@namei.org>

Showing 3 changed files with 8 additions and 8 deletions Side-by-side Diff

Documentation/tomoyo.txt
Diff comments   View file @ e6f6a4c
... ... @@ -3,8 +3,8 @@
3 3 TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel.
4 4  
5 5 LiveCD-based tutorials are available at
6   -http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/ubuntu8.04-live/
7   -http://tomoyo.sourceforge.jp/en/1.6.x/1st-step/centos5-live/ .
  6 +http://tomoyo.sourceforge.jp/1.7/1st-step/ubuntu10.04-live/
  7 +http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ .
8 8 Though these tutorials use non-LSM version of TOMOYO, they are useful for you
9 9 to know what TOMOYO is.
10 10  
11 11  
... ... @@ -13,12 +13,12 @@
13 13 Build the kernel with CONFIG_SECURITY_TOMOYO=y and pass "security=tomoyo" on
14 14 kernel's command line.
15 15  
16   -Please see http://tomoyo.sourceforge.jp/en/2.2.x/ for details.
  16 +Please see http://tomoyo.sourceforge.jp/2.3/ for details.
17 17  
18 18 --- Where is documentation? ---
19 19  
20 20 User <-> Kernel interface documentation is available at
21   -http://tomoyo.sourceforge.jp/en/2.2.x/policy-reference.html .
  21 +http://tomoyo.sourceforge.jp/2.3/policy-reference.html .
22 22  
23 23 Materials we prepared for seminars and symposiums are available at
24 24 http://sourceforge.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .
... ... @@ -50,7 +50,7 @@
50 50 SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.
51 51  
52 52 We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM
53   -version of TOMOYO, available at http://tomoyo.sourceforge.jp/en/1.6.x/ .
  53 +version of TOMOYO, available at http://tomoyo.sourceforge.jp/1.7/ .
54 54 LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning
55 55 to port non-LSM version's functionalities to LSM versions.
... ... @@ -5605,7 +5605,7 @@
5605 5605 L: tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
5606 5606 L: tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
5607 5607 W: http://tomoyo.sourceforge.jp/
5608   -T: quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches/
  5608 +T: quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/
5609 5609 S: Maintained
5610 5610 F: security/tomoyo/
5611 5611  
security/tomoyo/common.c
Diff comments   View file @ e6f6a4c
... ... @@ -1747,7 +1747,7 @@
1747 1747 static void tomoyo_read_version(struct tomoyo_io_buffer *head)
1748 1748 {
1749 1749 if (!head->r.eof) {
1750   - tomoyo_io_printf(head, "2.3.0-pre");
  1750 + tomoyo_io_printf(head, "2.3.0");
1751 1751 head->r.eof = true;
1752 1752 }
1753 1753 }
... ... @@ -2054,7 +2054,7 @@
2054 2054 if (tomoyo_profile_version != 20090903)
2055 2055 panic("Profile version %u is not supported.\n",
2056 2056 tomoyo_profile_version);
2057   - printk(KERN_INFO "TOMOYO: 2.3.0-pre 2010/06/03\n");
  2057 + printk(KERN_INFO "TOMOYO: 2.3.0\n");
2058 2058 printk(KERN_INFO "Mandatory Access Control activated.\n");
2059 2059 }