diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 11:18:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-07 11:18:28 -0800 |
commit | 6339204ecc2aa2067a99595522de0403f0854bb8 (patch) | |
tree | 02665f55428bf646722cdc59750d2c2dee0595d1 /init/main.c | |
parent | Fix race in tty_fasync() properly (diff) | |
parent | Take ima_file_free() to proper place. (diff) | |
download | linux-dev-6339204ecc2aa2067a99595522de0403f0854bb8.tar.xz linux-dev-6339204ecc2aa2067a99595522de0403f0854bb8.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
Take ima_file_free() to proper place.
ima: rename PATH_CHECK to FILE_CHECK
ima: rename ima_path_check to ima_file_check
ima: initialize ima before inodes can be allocated
fix ima breakage
Take ima_path_check() in nfsd past dentry_open() in nfsd_open()
freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb
befs: fix leak
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index dac44a9356a5..4cb47a159f02 100644 --- a/init/main.c +++ b/init/main.c @@ -657,9 +657,9 @@ asmlinkage void __init start_kernel(void) proc_caches_init(); buffer_init(); key_init(); + radix_tree_init(); security_init(); vfs_caches_init(totalram_pages); - radix_tree_init(); signals_init(); /* rootfs populating might need page-writeback */ page_writeback_init(); |