3.0-stable review patch. If anyone has any objections, please let me know.
------------------ From: Avi Kivity <a...@redhat.com> 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 <tra...@redhat.com> Signed-off-by: Avi Kivity <a...@redhat.com> Cc: Michael Tokarev <m...@tls.msk.ru> Cc: Borislav Petkov <borislav.pet...@amd.com> Cc: Marcelo Tosatti <mtosa...@redhat.com> Cc: qemu-devel@nongnu.org Cc: Anthony Liguori <anth...@codemonkey.ws> Cc: H. Peter Anvin <h...@linux.intel.com> Cc: Alan Cox <a...@lxorguk.ukuu.org.uk> Cc: Alan Cox <a...@linux.intel.com> Link: http://lkml.kernel.org/r/5034ae84.90...@redhat.com Signed-off-by: Ingo Molnar <mi...@kernel.org> Cc: Ben Jencks <b...@bjencks.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- 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 @@ -161,7 +161,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,
