Skip to content

Commit 05fb3c1

Browse files
amlutoingomolnar
authored andcommitted
x86/boot: Initialize FPU and X86_FEATURE_ALWAYS even if we don't have CPUID
Otherwise arch_task_struct_size == 0 and we die. While we're at it, set X86_FEATURE_ALWAYS, too. Reported-by: David Saggiorato <david@saggiorato.net> Tested-by: David Saggiorato <david@saggiorato.net> Signed-off-by: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dave Hansen <dave@sr71.net> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Fixes: aaeb5c01c5b ("x86/fpu, sched: Introduce CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT and use it on x86") Link: http://lkml.kernel.org/r/8de723afbf0811071185039f9088733188b606c9.1475103911.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent e4aad64 commit 05fb3c1

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

arch/x86/kernel/cpu/common.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -804,21 +804,20 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
804804
identify_cpu_without_cpuid(c);
805805

806806
/* cyrix could have cpuid enabled via c_identify()*/
807-
if (!have_cpuid_p())
808-
return;
807+
if (have_cpuid_p()) {
808+
cpu_detect(c);
809+
get_cpu_vendor(c);
810+
get_cpu_cap(c);
809811

810-
cpu_detect(c);
811-
get_cpu_vendor(c);
812-
get_cpu_cap(c);
813-
814-
if (this_cpu->c_early_init)
815-
this_cpu->c_early_init(c);
812+
if (this_cpu->c_early_init)
813+
this_cpu->c_early_init(c);
816814

817-
c->cpu_index = 0;
818-
filter_cpuid_features(c, false);
815+
c->cpu_index = 0;
816+
filter_cpuid_features(c, false);
819817

820-
if (this_cpu->c_bsp_init)
821-
this_cpu->c_bsp_init(c);
818+
if (this_cpu->c_bsp_init)
819+
this_cpu->c_bsp_init(c);
820+
}
822821

823822
setup_force_cpu_cap(X86_FEATURE_ALWAYS);
824823
fpu__init_system(c);

0 commit comments

Comments
 (0)