Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~andy/linux] / init / main.c

diff --git a/init/main.c b/init/main.c
index 48df882d51d2e709eaf5e79be55e806d75b6d6c5..d2f1e086bf337d064aaeef6baa0865ca6ba5fd31 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -504,11 +504,14 @@ asmlinkage void __init start_kernel(void)
         * These use large bootmem allocations and must precede
         * kmem_cache_init()
         */
+       setup_log_buf(0);
        pidhash_init();
        vfs_caches_init_early();
        sort_main_extable();
        trap_init();
        mm_init();
+       BUG_ON(mm_init_cpumask(&init_mm, 0));
+
        /*
         * Set up the scheduler prior starting any interrupts (such as the
         * timer interrupt). Full topology setup happens at smp_init()