diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-13 13:47:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-13 13:47:13 -0500 |
| commit | a42cf70eb81558082e9a26fe8541d160b6c2a694 (patch) | |
| tree | 53258e360c1934c8203bbed0e1f39df347185e37 /scripts | |
| parent | f1252515d901ee2a184a9d49a7f29ae14da823eb (diff) | |
| parent | 9cc019b8c94fa59e02fd82f15f7b7d689e35c190 (diff) | |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module update from Rusty Russell:
"Trivial cleanups, mainly"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
module: Replace over-engineered nested sleep
module: Annotate nested sleep in resolve_symbol()
module: Remove double spaces in module verification taint message
kernel/module.c: Free lock-classes if parse_args failed
module: set ksymtab/kcrctab* section addresses to 0x0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/module-common.lds | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/module-common.lds b/scripts/module-common.lds index 0865b3e752be..bec15f908fc6 100644 --- a/scripts/module-common.lds +++ b/scripts/module-common.lds | |||
| @@ -6,14 +6,14 @@ | |||
| 6 | SECTIONS { | 6 | SECTIONS { |
| 7 | /DISCARD/ : { *(.discard) } | 7 | /DISCARD/ : { *(.discard) } |
| 8 | 8 | ||
| 9 | __ksymtab : { *(SORT(___ksymtab+*)) } | 9 | __ksymtab 0 : { *(SORT(___ksymtab+*)) } |
| 10 | __ksymtab_gpl : { *(SORT(___ksymtab_gpl+*)) } | 10 | __ksymtab_gpl 0 : { *(SORT(___ksymtab_gpl+*)) } |
| 11 | __ksymtab_unused : { *(SORT(___ksymtab_unused+*)) } | 11 | __ksymtab_unused 0 : { *(SORT(___ksymtab_unused+*)) } |
| 12 | __ksymtab_unused_gpl : { *(SORT(___ksymtab_unused_gpl+*)) } | 12 | __ksymtab_unused_gpl 0 : { *(SORT(___ksymtab_unused_gpl+*)) } |
| 13 | __ksymtab_gpl_future : { *(SORT(___ksymtab_gpl_future+*)) } | 13 | __ksymtab_gpl_future 0 : { *(SORT(___ksymtab_gpl_future+*)) } |
| 14 | __kcrctab : { *(SORT(___kcrctab+*)) } | 14 | __kcrctab 0 : { *(SORT(___kcrctab+*)) } |
| 15 | __kcrctab_gpl : { *(SORT(___kcrctab_gpl+*)) } | 15 | __kcrctab_gpl 0 : { *(SORT(___kcrctab_gpl+*)) } |
| 16 | __kcrctab_unused : { *(SORT(___kcrctab_unused+*)) } | 16 | __kcrctab_unused 0 : { *(SORT(___kcrctab_unused+*)) } |
| 17 | __kcrctab_unused_gpl : { *(SORT(___kcrctab_unused_gpl+*)) } | 17 | __kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) } |
| 18 | __kcrctab_gpl_future : { *(SORT(___kcrctab_gpl_future+*)) } | 18 | __kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) } |
| 19 | } | 19 | } |