[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [ 56/58] x86/alternatives: Fix p6 nops on non-modular kerne
From: |
Greg Kroah-Hartman |
Subject: |
[Qemu-devel] [ 56/58] x86/alternatives: Fix p6 nops on non-modular kernels |
Date: |
Thu, 4 Oct 2012 14:20:03 -0700 |
User-agent: |
quilt/0.60-2.1.2 |
3.5-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avi Kivity <address@hidden>
commit cb09cad44f07044d9810f18f6f9a6a6f3771f979 upstream.
Probably a leftover from the early days of self-patching, p6nops
are marked __initconst_or_module, which causes them to be
discarded in a non-modular kernel. If something later triggers
patching, it will overwrite kernel code with garbage.
Reported-by: Tomas Racek <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
Cc: Michael Tokarev <address@hidden>
Cc: Borislav Petkov <address@hidden>
Cc: Marcelo Tosatti <address@hidden>
Cc: address@hidden
Cc: Anthony Liguori <address@hidden>
Cc: H. Peter Anvin <address@hidden>
Cc: Alan Cox <address@hidden>
Cc: Alan Cox <address@hidden>
Link: http://lkml.kernel.org/r/address@hidden
Signed-off-by: Ingo Molnar <address@hidden>
Cc: Ben Jencks <address@hidden>
Signed-off-by: Greg Kroah-Hartman <address@hidden>
---
arch/x86/kernel/alternative.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -160,7 +160,7 @@ static const unsigned char * const k7_no
#endif
#ifdef P6_NOP1
-static const unsigned char __initconst_or_module p6nops[] =
+static const unsigned char p6nops[] =
{
P6_NOP1,
P6_NOP2,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [ 56/58] x86/alternatives: Fix p6 nops on non-modular kernels,
Greg Kroah-Hartman <=