Commit 015221fe authored Mar 03, 2013 by Krzysztof Mazur Committed by H. Peter Anvin Mar 06, 2013

x86: Fix 32-bit *_cpu_data initializers



The commit 27be4570
('x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok
flag') removed the hlt_works_ok flag from struct cpuinfo_x86, but
boot_cpu_data and new_cpu_data initializers were not changed
causing setting f00f_bug flag, instead of fdiv_bug.

If CONFIG_X86_F00F_BUG is not set the f00f_bug flag is never
cleared.

To avoid such problems in future C99-style initialization is now
used.

Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>
Acked-by: Borislav Petkov <bp@suse.de>
Cc: len.brown@intel.com
Link: http://lkml.kernel.org/r/1362266082-2227-1-git-send-email-krzysiek@podlesie.net


Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 4ecccd9e

arch/x86/kernel/setup.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -171,9 +171,15 @@ static struct resource bss_resource = {

		#ifdef CONFIG_X86_32
		/* cpu data as detected by the assembly code in head.S */
		struct cpuinfo_x86 new_cpu_data __cpuinitdata = {0, 0, 0, 0, -1, 1, 0, 0, -1};
		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 = {0, 0, 0, 0, -1, 1, 0, 0, -1};
		struct cpuinfo_x86 boot_cpu_data __read_mostly = {
		.wp_works_ok = -1,
		.fdiv_bug = -1,
		};
		EXPORT_SYMBOL(boot_cpu_data);

		unsigned int def_to_bigsmp;

Admin message