[PATCH] Use early CPU identify before early command line parsing

This makes it possible to modify CPU flags in command line
options without hacks.

And remove another copy in head64.c

Signed-off-by: Andi Kleen <ak@suse.de>

diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index bacbd75c63ad07a31f9a69c4dbff1eff4f55ca20..f2461fde9f8f1b9826e4aaeb4b7451fb5df2646d 100644 (file)
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -56,24 +56,6 @@ static void __init copy_bootdata(char *real_mode_data)
        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;
@@ -117,6 +99,5 @@ void __init x86_64_start_kernel(char * real_mode_data)
        if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
                panic("Kernel too big for kernel mapping\n");
 
-       setup_boot_cpu_data();
        start_kernel();
 }

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index ddc3b2d9a1654e913b60705706b53670a25d7ef7..73f1cdd140fe439b3ac8a1b15149c0fe284f0ea2 100644 (file)
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -545,10 +545,10 @@ void __init setup_arch(char **cmdline_p)
        data_resource.start = virt_to_phys(&_etext);
        data_resource.end = virt_to_phys(&_edata)-1;
 
-       parse_cmdline_early(cmdline_p);
-
        early_identify_cpu(&boot_cpu_data);
 
+       parse_cmdline_early(cmdline_p);
+
        /*
         * partially used pages are not usable - thus
         * we are rounding upwards: