From 03a5c990b59b6c61c11fe7b6cb953199e3f7f9cc Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Tue, 19 Aug 2008 20:49:46 -0700
Subject: [PATCH] --- yaml --- r: 116391 b: refs/heads/master c:
 6da55c3e8da88e8a7cb6452160776ad6706798ad h: refs/heads/master i:   116389:
 577e3a7c50ddb41bc13780e2788538dfdff4516c   116387:
 7bef8449d21e76f14ff82401e68a084a527e6a1c   116383:
 9b3895637e6a040c60568f0e490213eee15f4002 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/Kconfig                     | 2 ++
 trunk/arch/x86/Kconfig                 | 1 +
 trunk/arch/x86/kernel/vmlinux_32.lds.S | 1 +
 trunk/arch/x86/kernel/vmlinux_64.lds.S | 3 +++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 27f07c7262b7..38b93d6b45ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8ff037a871690c762d267d8a052529d3102fc9
+refs/heads/master: 6da55c3e8da88e8a7cb6452160776ad6706798ad
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index 0267babe5eb9..c1f9febb404f 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -103,3 +103,5 @@ config HAVE_CLK
 	  The <linux/clk.h> calls support software clock gating and
 	  thus are a key power management tool on many systems.
 
+config HAVE_DYN_ARRAY
+	def_bool n
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index f65c2744d573..42f98009d752 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -33,6 +33,7 @@ config X86
 	select HAVE_ARCH_TRACEHOOK
 	select HAVE_GENERIC_DMA_COHERENT if X86_32
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS
+	select HAVE_DYN_ARRAY
 
 config ARCH_DEFCONFIG
 	string
diff --git a/trunk/arch/x86/kernel/vmlinux_32.lds.S b/trunk/arch/x86/kernel/vmlinux_32.lds.S
index a9b8560adbc2..c36007ab3940 100644
--- a/trunk/arch/x86/kernel/vmlinux_32.lds.S
+++ b/trunk/arch/x86/kernel/vmlinux_32.lds.S
@@ -145,6 +145,7 @@ SECTIONS
 	*(.x86_cpu_dev.init)
 	__x86_cpu_dev_end = .;
   }
+  DYN_ARRAY_INIT(8)
   SECURITY_INIT
   . = ALIGN(4);
   .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
diff --git a/trunk/arch/x86/kernel/vmlinux_64.lds.S b/trunk/arch/x86/kernel/vmlinux_64.lds.S
index 46e05447405b..30973dbac8c2 100644
--- a/trunk/arch/x86/kernel/vmlinux_64.lds.S
+++ b/trunk/arch/x86/kernel/vmlinux_64.lds.S
@@ -173,6 +173,9 @@ SECTIONS
 	*(.x86_cpu_dev.init)
   }
   __x86_cpu_dev_end = .;
+
+  DYN_ARRAY_INIT(8)
+
   SECURITY_INIT
 
   . = ALIGN(8);