diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 23:27:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 23:27:50 -0500 |
| commit | ce6513f758b1852a2f24f76f07d0fae304d24ad3 (patch) | |
| tree | 2186f8d1f4389734f5f6a4b20e448651edf57815 /include/asm-generic | |
| parent | d8fe4acc88da8fbbe360b6592c9d0abbb85117dc (diff) | |
| parent | b6568b1a19ad995221d1816c4fcdd116d9c33e42 (diff) | |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"Mainly boring here, too. rmmod --wait finally removed, though"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
modpost: fix bogus 'exported twice' warnings.
init: fix in-place parameter modification regression
asmlinkage, module: Make ksymtab and kcrctab symbols and __this_module __visible
kernel: add support for init_array constructors
modpost: Optionally ignore secondary errors seen if a single module build fails
module: remove rmmod --wait option.
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 83e2c31e8b00..bc2121fa9132 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -473,6 +473,7 @@ | |||
| 473 | #define KERNEL_CTORS() . = ALIGN(8); \ | 473 | #define KERNEL_CTORS() . = ALIGN(8); \ |
| 474 | VMLINUX_SYMBOL(__ctors_start) = .; \ | 474 | VMLINUX_SYMBOL(__ctors_start) = .; \ |
| 475 | *(.ctors) \ | 475 | *(.ctors) \ |
| 476 | *(.init_array) \ | ||
| 476 | VMLINUX_SYMBOL(__ctors_end) = .; | 477 | VMLINUX_SYMBOL(__ctors_end) = .; |
| 477 | #else | 478 | #else |
| 478 | #define KERNEL_CTORS() | 479 | #define KERNEL_CTORS() |