[Qemu-devel] x86, nops settings result in kernel crash

Commit Message

Avi Kivity Aug. 22, 2012, 9:54 a.m. UTC

On 08/21/2012 12:28 PM, Tomas Racek wrote:
> 
> http://fi.muni.cz/~xracek/debian2.img.bz2
> 
> Other things are the same.
> 
> The runtest.sh sets environment for xfstests and runs test 285 which I wrote and and which should test if FS sends discard requests only on free sectors:
> 285:
> 1. Create loop device and FS on it.
> 2. Populate it with some garbage.
> 3. Get free sectors from FS.
> 4. Run fstrim and look for discard requests via blk tracer.
> 5. Compare free sectors to discard requests.
> 
> The test itself can have some issues but I'm pretty sure it shouldn't crash the system. ;-)

Does the following patch help?

Patch

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index afb7ff7..ced4534 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -165,7 +165,7 @@  static int __init setup_noreplace_paravirt(char *str)
 #endif
 
 #ifdef P6_NOP1
-static const unsigned char  __initconst_or_module p6nops[] =
+static const unsigned char p6nops[] =
 {
 	P6_NOP1,
 	P6_NOP2,