[ 50/52] x86/alternatives: Fix p6 nops on non-modular kernels

2012-10-04 Thread Greg Kroah-Hartman
3.4-stable review patch.  If anyone has any objections, please let me know.

--

From: Avi Kivity 

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 
Signed-off-by: Avi Kivity 
Cc: Michael Tokarev 
Cc: Borislav Petkov 
Cc: Marcelo Tosatti 
Cc: qemu-de...@nongnu.org
Cc: Anthony Liguori 
Cc: H. Peter Anvin 
Cc: Alan Cox 
Cc: Alan Cox 
Link: http://lkml.kernel.org/r/5034ae84.90...@redhat.com
Signed-off-by: Ingo Molnar 
Cc: Ben Jencks 
Signed-off-by: Greg Kroah-Hartman 

---
 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,


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[ 50/52] x86/alternatives: Fix p6 nops on non-modular kernels

2012-10-04 Thread Greg Kroah-Hartman
3.4-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-de...@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
@@ -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,


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/