summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-08-22 15:54:53 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2008-08-22 15:54:53 +1000
commit9bb2dafc6d179e3a12361b6e0fff2c4cec8dcb10 (patch)
treef624c946ae26bb23161f35ab35f497befe3a8ae4 /init
parentc6aaa748b2ceac064b50751b73bcc6c7668b06b7 (diff)
parentc1e373cab440880302d299f3afc445ce34b18e7d (diff)
Merge commit 'creds/next-creds'
Conflicts: fs/namespace.c fs/nfsd/nfs4recover.c fs/xfs/linux-2.6/xfs_linux.h fs/xfs/xfs_inode.c fs/xfs/xfs_vnodeops.c include/linux/capability.h include/linux/cred.h kernel/exit.c kernel/fork.c security/commoncap.c security/selinux/hooks.c security/smack/smack_lsm.c
Diffstat (limited to 'init')
-rw-r--r--init/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c
index 361acbe994e6..f896ba168a6d 100644
--- a/init/main.c
+++ b/init/main.c
@@ -674,6 +674,7 @@ asmlinkage void __init start_kernel(void)
efi_enter_virtual_mode();
#endif
thread_info_cache_init();
+ cred_init();
fork_init(num_physpages);
proc_caches_init();
buffer_init();