Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4ca46e4 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Linus Torvalds
Browse files

x86-32: Fix boot with CONFIG_X86_INVD_BUG 



entry_32.S contained a hardcoded alternative instruction entry, and the
format changed in commit 59e97e4d ("x86: Make alternative
instruction pointers relative").

Replace the hardcoded entry with the altinstruction_entry macro.  This
fixes the 32-bit boot with CONFIG_X86_INVD_BUG=y.

Reported-and-tested-by: default avatarArnaud Lacombe <lacombar@gmail.com>
Signed-off-by: default avatarAndy Lutomirski <luto@mit.edu>
Cc: Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cbbfa38f

arch/x86/kernel/entry_32.S

+2 −6
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <asm/ftrace.h>

#include <asm/ftrace.h>

#include <asm/irq_vectors.h>

#include <asm/irq_vectors.h>

#include <asm/cpufeature.h>

#include <asm/cpufeature.h>

#include <asm/alternative-asm.h>





/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */

/* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */

#include <linux/elf-em.h>

#include <linux/elf-em.h>
@@ -873,12 +874,7 @@ ENTRY(simd_coprocessor_error) 
661:	pushl_cfi $do_general_protection

661:	pushl_cfi $do_general_protection

662:

662:

.section .altinstructions,"a"

.section .altinstructions,"a"

	.balign 4

	altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f

	.long 661b

	.long 663f

	.word X86_FEATURE_XMM

	.byte 662b-661b

	.byte 664f-663f

.previous

.previous

.section .altinstr_replacement,"ax"

.section .altinstr_replacement,"ax"

663:	pushl $do_simd_coprocessor_error

663:	pushl $do_simd_coprocessor_error