Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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