diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-01 17:04:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-01 17:04:50 -0800 |
| commit | 4977ab6e92e267afe9d8f78438c3db330ca8434c (patch) | |
| tree | 484ebc1e13ba9375a59f83649faf706d4d5372c0 /arch | |
| parent | Merge tag 'nfs-for-4.11-1' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| parent | objtool, modules: Discard objtool annotation sections for modules (diff) | |
| download | linux-dev-4977ab6e92e267afe9d8f78438c3db330ca8434c.tar.xz linux-dev-4977ab6e92e267afe9d8f78438c3db330ca8434c.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index ad0118fbce90..c74ae9ce8dc4 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -345,8 +345,6 @@ SECTIONS DISCARDS /DISCARD/ : { *(.eh_frame) - *(__func_stack_frame_non_standard) - *(__unreachable) } } |