printk: allocate kernel log buffer earlier

[deliverable/linux.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4be9b398470ea7ed399fcd72d39c67681ae98e3f..a3e5948670c241eecb15028cefeae8209b37c669 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -691,8 +691,6 @@ early_param("reservelow", parse_reservelow);
 
 void __init setup_arch(char **cmdline_p)
 {
-       unsigned long flags;
-
 #ifdef CONFIG_X86_32
        memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
        visws_early_detect();
@@ -948,6 +946,8 @@ void __init setup_arch(char **cmdline_p)
        if (init_ohci1394_dma_early)
                init_ohci1394_dma_on_all_controllers();
 #endif
+       /* Allocate bigger log buffer */
+       setup_log_buf(1);
 
        reserve_initrd();
 
@@ -966,7 +966,6 @@ void __init setup_arch(char **cmdline_p)
 
        initmem_init();
        memblock_find_dma_reserve();
-       dma32_reserve_bootmem();
 
 #ifdef CONFIG_KVM_CLOCK
        kvmclock_init();
@@ -1041,9 +1040,7 @@ void __init setup_arch(char **cmdline_p)
 
        mcheck_init();
 
-       local_irq_save(flags);
-       arch_init_ideal_nop5();
-       local_irq_restore(flags);
+       arch_init_ideal_nops();
 }
 
 #ifdef CONFIG_X86_32