Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index e810196bf2f2ae2522fd7ce1ec0dbae3d7f6ebd9..17e9757bfde2310c6bc7a8407fee6eba7cd4b0ad 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -670,6 +670,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();
@@ -723,7 +724,7 @@ int do_one_initcall(initcall_t fn)
                disable_boot_trace();
                rettime = ktime_get();
                delta = ktime_sub(rettime, calltime);
-               ret.duration = (unsigned long long) delta.tv64 >> 10;
+               ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
                trace_boot_ret(&ret, fn);
                printk("initcall %pF returned %d after %Ld usecs\n", fn,
                        ret.result, ret.duration);