diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 21:15:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-28 21:15:59 +0300 |
| commit | e72e58faa709d554f95431dbafd3374db5ed3fbb (patch) | |
| tree | f73ee22c1f93a5e56d1930a29f82aae4f39aa956 /arch | |
| parent | 74e3f63ce60eb81fbd39aa6c0353059b7e2cb5f7 (diff) | |
| parent | 4e4636cf981b5b629fbfb78aa9f232e015f7d521 (diff) | |
| download | linux-e72e58faa709d554f95431dbafd3374db5ed3fbb.tar.xz | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull objtool fixes from Ingo Molnar:
"A handful of objtool fixes related to unreachable code, plus a build
fix for out of tree modules"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
objtool: Enclose contents of unreachable() macro in a block
objtool: Prevent GCC from merging annotate_unreachable()
objtool: Improve detection of BUG() and other dead ends
objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index e79f15f108a8..ad0118fbce90 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -346,6 +346,7 @@ SECTIONS /DISCARD/ : { *(.eh_frame) *(__func_stack_frame_non_standard) + *(__unreachable) } } |