From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:56699)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gregkh@linuxfoundation.org>) id 1TJsvf-0004qA-43
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:26:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gregkh@linuxfoundation.org>) id 1TJsvd-0002d8-2q
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:25:59 -0400
Received: from mail-pb0-f45.google.com ([209.85.160.45]:43625)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gregkh@linuxfoundation.org>) id 1TJsvc-0002d4-Ns
	for qemu-devel@nongnu.org; Thu, 04 Oct 2012 17:25:56 -0400
Received: by mail-pb0-f45.google.com with SMTP id rp2so999838pbb.4
	for <qemu-devel@nongnu.org>; Thu, 04 Oct 2012 14:25:55 -0700 (PDT)
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu,  4 Oct 2012 14:21:41 -0700
Message-Id: <20121004210641.663297238@linuxfoundation.org>
In-Reply-To: <20121004210635.372689554@linuxfoundation.org>
References: <20121004210635.372689554@linuxfoundation.org>
Subject: [Qemu-devel] [ 50/52] x86/alternatives: Fix p6 nops on non-modular
	kernels
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Marcelo Tosatti <mtosatti@redhat.com>, Michael Tokarev <mjt@tls.msk.ru>, Borislav Petkov <borislav.petkov@amd.com>, Tomas Racek <tracek@redhat.com>, qemu-devel@nongnu.org, Avi Kivity <avi@redhat.com>, Anthony Liguori <anthony@codemonkey.ws>, "H. Peter Anvin" <hpa@linux.intel.com>, Ben Jencks <ben@bjencks.net>, Ingo Molnar <mingo@kernel.org>, alan@lxorguk.ukuu.org.uk, Alan Cox <alan@linux.intel.com>

3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Avi Kivity <avi@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 <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>
Cc: Ben Jencks <ben@bjencks.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@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
@@ -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,