x86-32: Fix boot with CONFIG_X86_INVD_BUG
authorAndy Lutomirski <luto@mit.edu>
Thu, 25 Aug 2011 20:10:33 +0000 (16:10 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Aug 2011 20:27:14 +0000 (13:27 -0700)
commitb4ca46e4e82a0a5976fe5eab85be585d75f8202f
tree3c10c751f3946b11559b44051d7a889965770fcf
parentcbbfa38fcb95930babc5233cf6927ec430f38abc
x86-32: Fix boot with CONFIG_X86_INVD_BUG

entry_32.S contained a hardcoded alternative instruction entry, and the
format changed in commit 59e97e4d6fbc ("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: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Andy Lutomirski <luto@mit.edu>
Cc: Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/entry_32.S