Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool relocation fixes from Ingo Molnar:
 "Two fixes related to the module loading regression introduced by the
  recent objtool changes"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool, modules: Discard objtool annotation sections for modules
  objtool, compiler.h: Fix __unreachable section relocation size

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
index 76e28c229805..0efef9cf014f 100644
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
@@ -200,8 +200,8 @@
 #ifdef CONFIG_STACK_VALIDATION
 #define annotate_unreachable() ({                                       \
         asm("%c0:\t\n"                                                  \
-            ".pushsection __unreachable, \"a\"\t\n"                     \
-            ".long %c0b\t\n"                                            \
+            ".pushsection .discard.unreachable\t\n"                     \
+            ".long %c0b - .\t\n"                                        \
             ".popsection\t\n" : : "i" (__LINE__));                      \
 })
 #else