Merge branch 'x86/asm' into locking/core

[people/arne_f/kernel.git] / include / linux / compiler-gcc.h

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index bdb80c4aef6e13631075b2ad06b39d2788c8eba5..10825052b03f847111b3d4ed8b682c3be5439fb9 100644 (file)
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -203,11 +203,16 @@
 
 #ifdef CONFIG_STACK_VALIDATION
 #define annotate_unreachable() ({                                      \
-       asm("%c0:\t\n"                                                  \
-           ".pushsection .discard.unreachable\t\n"                     \
-           ".long %c0b - .\t\n"                                        \
-           ".popsection\t\n" : : "i" (__LINE__));                      \
+       asm("%c0:\n\t"                                                  \
+           ".pushsection .discard.unreachable\n\t"                     \
+           ".long %c0b - .\n\t"                                        \
+           ".popsection\n\t" : : "i" (__LINE__));                      \
 })
+#define ASM_UNREACHABLE                                                        \
+       "999:\n\t"                                                      \
+       ".pushsection .discard.unreachable\n\t"                         \
+       ".long 999b - .\n\t"                                            \
+       ".popsection\n\t"
 #else
 #define annotate_unreachable()
 #endif