diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-04 04:12:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-04 04:12:27 +0200 |
| commit | a1be8edda4fe1f0a75007f26000a51436800869d (patch) | |
| tree | 69ecbeda52cfa375431de08e9dcfbcede4ed4883 /scripts | |
| parent | Merge tag 'trace-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rost... (diff) | |
| parent | kallsyms: Use bounded strnchr() when parsing string (diff) | |
| download | linux-a1be8edda4fe1f0a75007f26000a51436800869d.tar.xz linux-a1be8edda4fe1f0a75007f26000a51436800869d.zip | |
Merge tag 'modules-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules updates from Jessica Yu:
- Minor code cleanups
- Fix section alignment for .init_array
* tag 'modules-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
kallsyms: Use bounded strnchr() when parsing string
module: Unify the return value type of try_module_get
module: set .init_array alignment to 8
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/module-common.lds | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/module-common.lds b/scripts/module-common.lds index 9b6e246a45d0..d61b9e8678e8 100644 --- a/scripts/module-common.lds +++ b/scripts/module-common.lds @@ -20,8 +20,7 @@ SECTIONS { __kcrctab_unused_gpl 0 : { *(SORT(___kcrctab_unused_gpl+*)) } __kcrctab_gpl_future 0 : { *(SORT(___kcrctab_gpl_future+*)) } - . = ALIGN(8); - .init_array 0 : { *(SORT(.init_array.*)) *(.init_array) } + .init_array 0 : ALIGN(8) { *(SORT(.init_array.*)) *(.init_array) } __jump_table 0 : ALIGN(8) { KEEP(*(__jump_table)) } } |