diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 09:52:15 +0800 |
commit | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (patch) | |
tree | c845d5e80991f0eef3a38381036c8261baffb08a /include/asm-generic/vmlinux.lds.h | |
parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
parent | 7b44c3df0b89d05c80e15eb0522a21d033d1314f (diff) |
Merge branch 'v3.18/topic/KASAN' into linux-linaro-lsk-v3.18lsk-v3.18-16.04
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
-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 bee5d683074d..ac78910d7416 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -478,6 +478,7 @@ #define KERNEL_CTORS() . = ALIGN(8); \ VMLINUX_SYMBOL(__ctors_start) = .; \ *(.ctors) \ + *(SORT(.init_array.*)) \ *(.init_array) \ VMLINUX_SYMBOL(__ctors_end) = .; #else |