1 files changed, 1 insertions, 43 deletions

diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 36647ce6aecb..9561eb3c5b5c 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -45,38 +45,16 @@ static void __init copy_bootdata(char *real_mode_data)
         new_data = *(int *) (x86_boot_params + NEW_CL_POINTER);
         if (!new_data) {
                 if (OLD_CL_MAGIC != * (u16 *) OLD_CL_MAGIC_ADDR) {
-                        printk("so old bootloader that it does not support commandline?!\n");
                         return;
                 }
                 new_data = OLD_CL_BASE_ADDR + * (u16 *) OLD_CL_OFFSET;
-                printk("old bootloader convention, maybe loadlin?\n");
         }
         command_line = (char *) ((u64)(new_data));
         memcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
-        printk("Bootdata ok (command line is %s)\n", saved_command_line);       
-}
-
-static void __init setup_boot_cpu_data(void)
-{
-        unsigned int dummy, eax;
-
-        /* get vendor info */
-        cpuid(0, (unsigned int *)&boot_cpu_data.cpuid_level,
-              (unsigned int *)&boot_cpu_data.x86_vendor_id[0],
-              (unsigned int *)&boot_cpu_data.x86_vendor_id[8],
-              (unsigned int *)&boot_cpu_data.x86_vendor_id[4]);
-
-        /* get cpu type */
-        cpuid(1, &eax, &dummy, &dummy,
-                (unsigned int *) &boot_cpu_data.x86_capability);
-        boot_cpu_data.x86 = (eax >> 8) & 0xf;
-        boot_cpu_data.x86_model = (eax >> 4) & 0xf;
-        boot_cpu_data.x86_mask = eax & 0xf;
 }
 
 void __init x86_64_start_kernel(char * real_mode_data)
 {
-        char *s;
         int i;
 
         for (i = 0; i < 256; i++)
@@ -84,10 +62,7 @@ void __init x86_64_start_kernel(char * real_mode_data)
         asm volatile("lidt %0" :: "m" (idt_descr));
         clear_bss();
 
-        /*
-         * This must be called really, really early:
-         */
-        lockdep_init();
+        early_printk("Kernel alive\n");
 
         /*
          * switch to init_level4_pgt from boot_level4_pgt
@@ -103,22 +78,5 @@ void __init x86_64_start_kernel(char * real_mode_data)
 #ifdef CONFIG_SMP
         cpu_set(0, cpu_online_map);
 #endif
-        s = strstr(saved_command_line, "earlyprintk=");
-        if (s != NULL)
-                setup_early_printk(strchr(s, '=') + 1);
-#ifdef CONFIG_NUMA
-        s = strstr(saved_command_line, "numa=");
-        if (s != NULL)
-                numa_setup(s+5);
-#endif
-#ifdef CONFIG_X86_IO_APIC
-        if (strstr(saved_command_line, "disableapic"))
-                disable_apic = 1;
-#endif
-        /* You need early console to see that */
-        if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
-                panic("Kernel too big for kernel mapping\n");
-
-        setup_boot_cpu_data();
         start_kernel();
 }