aboutsummaryrefslogtreecommitdiff
path: root/include/asm-generic
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-03-17 21:59:05 +0000
committerMark Brown <broonie@kernel.org>2015-03-17 21:59:05 +0000
commit43e7406efd7822d75c64310461d2cbca0ece19f0 (patch)
tree22a7e030ac75c7db2b767292c59c9a36bb810c9c /include/asm-generic
parent42f504e28a169ebfea0e3d9c6e151451800e41d5 (diff)
parent3d95e2f8f6c3666ffb3f5aee405ecc15a14ea570 (diff)
Merge remote-tracking branch 'lsk/v3.10/topic/gcov' into linux-linaro-lsk
Conflicts: arch/arm64/Kconfig
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 7414dd5132e5..7dd0ebecbcd3 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -505,6 +505,7 @@
#define KERNEL_CTORS() . = ALIGN(8); \
VMLINUX_SYMBOL(__ctors_start) = .; \
*(.ctors) \
+ *(.init_array) \
VMLINUX_SYMBOL(__ctors_end) = .;
#else
#define KERNEL_CTORS()