Index: linux-x86.q/arch/x86/kernel/test_nx.c
===================================================================
--- linux-x86.q.orig/arch/x86/kernel/test_nx.c
+++ linux-x86.q/arch/x86/kernel/test_nx.c
@@ -91,8 +91,13 @@ static noinline int test_address(void *a
".previous\n"
".section __ex_table,\"a\"\n"
" .align 8\n"
+#ifdef CONFIG_X86_32
+ " .long 0b\n"
+ " .long 2b\n"
+#endif
" .quad 0b\n"
" .quad 2b\n"
+#else
".previous\n"
: [rslt] "=r" (result)
: [fake_code] "r" (address), [zero] "r" (0UL), "0" (result)