Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index a85a144f2052bc43bcc1c78c5119f2f1e6dbcf7e..a5d550f2fa6e30c2cc65482b70eb036e0838d941 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -173,12 +173,10 @@ static struct resource bss_resource = {
 /* cpu data as detected by the assembly code in head.S */
 struct cpuinfo_x86 new_cpu_data __cpuinitdata = {
        .wp_works_ok = -1,
-       .fdiv_bug = -1,
 };
 /* common cpu data for all cpus */
 struct cpuinfo_x86 boot_cpu_data __read_mostly = {
        .wp_works_ok = -1,
-       .fdiv_bug = -1,
 };
 EXPORT_SYMBOL(boot_cpu_data);
 
@@ -528,7 +526,7 @@ static void __init reserve_crashkernel_low(void)
        int ret;
 
        total_low_mem = memblock_mem_size(1UL<<(32-PAGE_SHIFT));
-       /* crashkernel_low=YM */
+       /* crashkernel=Y,low */
        ret = parse_crashkernel_low(boot_command_line, total_low_mem,
                                                &low_size, &base);
        if (ret != 0) {
@@ -542,7 +540,7 @@ static void __init reserve_crashkernel_low(void)
                low_size = swiotlb_size_or_default() + (8UL<<20);
                auto_set = true;
        } else {
-               /* passed with crashkernel_low=0 ? */
+               /* passed with crashkernel=0,low ? */
                if (!low_size)
                        return;
        }
@@ -582,7 +580,7 @@ static void __init reserve_crashkernel(void)
        ret = parse_crashkernel(boot_command_line, total_mem,
                        &crash_size, &crash_base);
        if (ret != 0 || crash_size <= 0) {
-               /* crashkernel_high=XM */
+               /* crashkernel=X,high */
                ret = parse_crashkernel_high(boot_command_line, total_mem,
                                &crash_size, &crash_base);
                if (ret != 0 || crash_size <= 0)