aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/Kconfig2
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/kernel/vmlinux_32.lds.S1
-rw-r--r--arch/x86/kernel/vmlinux_64.lds.S3
4 files changed, 7 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 0267babe5eb9..c1f9febb404f 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -103,3 +103,5 @@ config HAVE_CLK
103 The <linux/clk.h> calls support software clock gating and 103 The <linux/clk.h> calls support software clock gating and
104 thus are a key power management tool on many systems. 104 thus are a key power management tool on many systems.
105 105
106config HAVE_DYN_ARRAY
107 def_bool n
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index f65c2744d573..42f98009d752 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -33,6 +33,7 @@ config X86
33 select HAVE_ARCH_TRACEHOOK 33 select HAVE_ARCH_TRACEHOOK
34 select HAVE_GENERIC_DMA_COHERENT if X86_32 34 select HAVE_GENERIC_DMA_COHERENT if X86_32
35 select HAVE_EFFICIENT_UNALIGNED_ACCESS 35 select HAVE_EFFICIENT_UNALIGNED_ACCESS
36 select HAVE_DYN_ARRAY
36 37
37config ARCH_DEFCONFIG 38config ARCH_DEFCONFIG
38 string 39 string
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index a9b8560adbc2..c36007ab3940 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -145,6 +145,7 @@ SECTIONS
145 *(.x86_cpu_dev.init) 145 *(.x86_cpu_dev.init)
146 __x86_cpu_dev_end = .; 146 __x86_cpu_dev_end = .;
147 } 147 }
148 DYN_ARRAY_INIT(8)
148 SECURITY_INIT 149 SECURITY_INIT
149 . = ALIGN(4); 150 . = ALIGN(4);
150 .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) { 151 .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index 46e05447405b..30973dbac8c2 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -173,6 +173,9 @@ SECTIONS
173 *(.x86_cpu_dev.init) 173 *(.x86_cpu_dev.init)
174 } 174 }
175 __x86_cpu_dev_end = .; 175 __x86_cpu_dev_end = .;
176
177 DYN_ARRAY_INIT(8)
178
176 SECURITY_INIT 179 SECURITY_INIT
177 180
178 . = ALIGN(8); 181 . = ALIGN(8);