ARM: hotplug cpu: Keep processor information, startup code & __lookup_processor_type

When hotplug CPU is enabled, we need to keep the list of supported CPUs,
their setup functions, and __lookup_processor_type in place so that we
can find and initialize secondary CPUs.  Move these into the __CPUINIT
section.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 17 insertions, 7 deletions

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index b16c07914b55..1630524a3097 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -8,6 +8,19 @@
 #include <asm/memory.h>
 #include <asm/page.h>
         
+#define PROC_INFO                                                       \
+        VMLINUX_SYMBOL(__proc_info_begin) = .;                          \
+        *(.proc.info.init)                                              \
+        VMLINUX_SYMBOL(__proc_info_end) = .;
+
+#ifdef CONFIG_HOTPLUG_CPU
+#define ARM_CPU_DISCARD(x)
+#define ARM_CPU_KEEP(x)         x
+#else
+#define ARM_CPU_DISCARD(x)      x
+#define ARM_CPU_KEEP(x)
+#endif
+
 OUTPUT_ARCH(arm)
 ENTRY(stext)
 
@@ -31,9 +44,7 @@ SECTIONS
                         HEAD_TEXT
                         INIT_TEXT
                 _einittext = .;
-                __proc_info_begin = .;
-                        *(.proc.info.init)
-                __proc_info_end = .;
+                ARM_CPU_DISCARD(PROC_INFO)
                 __arch_info_begin = .;
                         *(.arch.info.init)
                 __arch_info_end = .;
@@ -68,10 +79,8 @@ SECTIONS
         /DISCARD/ : {
                 *(.ARM.exidx.exit.text)
                 *(.ARM.extab.exit.text)
-#ifndef CONFIG_HOTPLUG_CPU
-                *(.ARM.exidx.cpuexit.text)
-                *(.ARM.extab.cpuexit.text)
-#endif
+                ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))
+                ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))
 #ifndef CONFIG_HOTPLUG
                 *(.ARM.exidx.devexit.text)
                 *(.ARM.extab.devexit.text)
@@ -100,6 +109,7 @@ SECTIONS
                         *(.glue_7)
                         *(.glue_7t)
                 *(.got)                 /* Global offset table          */
+                        ARM_CPU_KEEP(PROC_INFO)
         }
 
         RO_DATA(PAGE_SIZE)