[IA64] fix a few section mismatch warnings

Fix the following section mismatch warnings:

WARNING: vmlinux.o(.text+0x41902): Section mismatch: reference to .init.text:__alloc_bootmem (between 'ia64_mca_cpu_init' and 'ia64_do_tlb_purge')
WARNING: vmlinux.o(.text+0x49222): Section mismatch: reference to .init.text:__alloc_bootmem (between 'register_intr' and 'iosapic_register_intr')
WARNING: vmlinux.o(.text+0x62beb2): Section mismatch: reference to .init.text:__alloc_bootmem_node (between 'hubdev_init_node' and 'cnodeid_get_geoid')

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 4b5daa3cc0fe..ff28620cb992 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1750,8 +1750,17 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
         strncpy(p->comm, type, sizeof(p->comm)-1);
 }
 
-/* Do per-CPU MCA-related initialization.  */
+/* Caller prevents this from being called after init */
+static void * __init_refok mca_bootmem(void)
+{
+        void *p;
 
+        p = alloc_bootmem(sizeof(struct ia64_mca_cpu) * NR_CPUS +
+                          KERNEL_STACK_SIZE);
+        return (void *)ALIGN((unsigned long)p, KERNEL_STACK_SIZE);
+}
+
+/* Do per-CPU MCA-related initialization.  */
 void __cpuinit
 ia64_mca_cpu_init(void *cpu_data)
 {
@@ -1763,11 +1772,7 @@ ia64_mca_cpu_init(void *cpu_data)
                 int cpu;
 
                 first_time = 0;
-                mca_data = alloc_bootmem(sizeof(struct ia64_mca_cpu)
-                                         * NR_CPUS + KERNEL_STACK_SIZE);
-                mca_data = (void *)(((unsigned long)mca_data +
-                                        KERNEL_STACK_SIZE - 1) &
-                                (-KERNEL_STACK_SIZE));
+                mca_data = mca_bootmem();
                 for (cpu = 0; cpu < NR_CPUS; cpu++) {
                         format_mca_init_stack(mca_data,
                                         offsetof(struct ia64_mca_cpu, mca_stack),