diff options
| author | Linus Torvalds <[email protected]> | 2017-03-02 01:04:50 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-03-02 01:04:50 +0000 |
| commit | 4977ab6e92e267afe9d8f78438c3db330ca8434c (patch) | |
| tree | 484ebc1e13ba9375a59f83649faf706d4d5372c0 /scripts/mod/modpost.c | |
| 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 | kernel-4977ab6e92e267afe9d8f78438c3db330ca8434c.tar.gz kernel-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 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 4dedd0d3d3a7..30d752a4a6a6 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -854,6 +854,7 @@ static const char *const section_white_list[] = ".cmem*", /* EZchip */ ".fmt_slot*", /* EZchip */ ".gnu.lto*", + ".discard.*", NULL }; |