diff options
| author | Avi Kivity <avi@redhat.com> | 2012-08-22 13:03:48 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-22 12:09:49 +0200 |
| commit | cb09cad44f07044d9810f18f6f9a6a6f3771f979 (patch) | |
| tree | d46afa5828ace6662bf155bb4f454f35fb63990f /arch/x86/kernel | |
| parent | 2530cd4f448935c74eeb49f29559589928e4b2f0 (diff) | |
| download | talos-obmc-linux-cb09cad44f07044d9810f18f6f9a6a6f3771f979.tar.gz talos-obmc-linux-cb09cad44f07044d9810f18f6f9a6a6f3771f979.zip | |
x86/alternatives: Fix p6 nops on non-modular kernels
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 <tracek@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: qemu-devel@nongnu.org
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Alan Cox <alan@linux.intel.com>
Link: http://lkml.kernel.org/r/5034AE84.90708@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/alternative.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index afb7ff79a29f..ced4534baed5 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -165,7 +165,7 @@ static const unsigned char * const k7_nops[ASM_NOP_MAX+2] = #endif #ifdef P6_NOP1 -static const unsigned char __initconst_or_module p6nops[] = +static const unsigned char p6nops[] = { P6_NOP1, P6_NOP2, |
