diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-02 08:51:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-02 08:51:32 +0100 |
| commit | e2679aecf1060063b97bf187ba1c61430aab0701 (patch) | |
| tree | 5561750fe879c1de1e452a082b4111d1eca7c14c /include/linux/compiler-gcc.h | |
| parent | 9dcfe2c75b51f454f39c2de4756e841228865b47 (diff) | |
| parent | 4977ab6e92e267afe9d8f78438c3db330ca8434c (diff) | |
Merge branch 'linus' into locking/urgent, to pick up fixes
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 4 |
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 |