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 /scripts | |
| parent | 9dcfe2c75b51f454f39c2de4756e841228865b47 (diff) | |
| parent | 4977ab6e92e267afe9d8f78438c3db330ca8434c (diff) | |
Merge branch 'linus' into locking/urgent, to pick up fixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mod/modpost.c | 1 | ||||
| -rw-r--r-- | scripts/module-common.lds | 5 |
2 files changed, 5 insertions, 1 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 }; diff --git a/scripts/module-common.lds b/scripts/module-common.lds index 73a2c7da0e55..cf7e52e4781b 100644 --- a/scripts/module-common.lds +++ b/scripts/module-common.lds @@ -4,7 +4,10 @@ * combine them automatically. */ SECTIONS { - /DISCARD/ : { *(.discard) } + /DISCARD/ : { + *(.discard) + *(.discard.*) + } __ksymtab 0 : { *(SORT(___ksymtab+*)) } __ksymtab_gpl 0 : { *(SORT(___ksymtab_gpl+*)) } |