x86: move ioapic code where it belongs

The commit 399287229c775a8962a852a761d65dc9475dec7c hacked the
ioapic resource mapping into apic.c for no good reason.
Move the code into io_apic_64.c where it belongs.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 91 insertions, 87 deletions

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 0cb14d4c2c5..e0191cdd6f7 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -49,7 +49,6 @@ static int apic_calibrate_pmtmr __initdata;
 int local_apic_timer_c2_ok;
 EXPORT_SYMBOL_GPL(local_apic_timer_c2_ok);
 
-static struct resource *ioapic_resources;
 static struct resource lapic_resource = {
         .name = "Local APIC",
         .flags = IORESOURCE_MEM | IORESOURCE_BUSY,
@@ -714,64 +713,6 @@ static int __init detect_init_APIC (void)
         return 0;
 }
 
-#ifdef CONFIG_X86_IO_APIC
-static struct resource * __init ioapic_setup_resources(void)
-{
-#define IOAPIC_RESOURCE_NAME_SIZE 11
-        unsigned long n;
-        struct resource *res;
-        char *mem;
-        int i;
-
-        if (nr_ioapics <= 0)
-                return NULL;
-
-        n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
-        n *= nr_ioapics;
-
-        mem = alloc_bootmem(n);
-        res = (void *)mem;
-
-        if (mem != NULL) {
-                memset(mem, 0, n);
-                mem += sizeof(struct resource) * nr_ioapics;
-
-                for (i = 0; i < nr_ioapics; i++) {
-                        res[i].name = mem;
-                        res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
-                        sprintf(mem,  "IOAPIC %u", i);
-                        mem += IOAPIC_RESOURCE_NAME_SIZE;
-                }
-        }
-
-        ioapic_resources = res;
-
-        return res;
-}
-
-static int __init ioapic_insert_resources(void)
-{
-        int i;
-        struct resource *r = ioapic_resources;
-
-        if (!r) {
-                printk("IO APIC resources could be not be allocated.\n");
-                return -1;
-        }
-
-        for (i = 0; i < nr_ioapics; i++) {
-                insert_resource(&iomem_resource, r);
-                r++;
-        }
-
-        return 0;
-}
-
-/* Insert the IO APIC resources after PCI initialization has occured to handle
- * IO APICS that are mapped in on a BAR in PCI space. */
-late_initcall(ioapic_insert_resources);
-#endif
-
 void __init init_apic_mappings(void)
 {
         unsigned long apic_phys;
@@ -801,34 +742,6 @@ void __init init_apic_mappings(void)
          * default configuration (or the MP table is broken).
          */
         boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));
-
-        {
-                unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;
-                int i;
-                struct resource *ioapic_res;
-
-                ioapic_res = ioapic_setup_resources();
-                for (i = 0; i < nr_ioapics; i++) {
-                        if (smp_found_config) {
-                                ioapic_phys = mp_ioapics[i].mpc_apicaddr;
-                        } else {
-                                ioapic_phys = (unsigned long)
-                                        alloc_bootmem_pages(PAGE_SIZE);
-                                ioapic_phys = __pa(ioapic_phys);
-                        }
-                        set_fixmap_nocache(idx, ioapic_phys);
-                        apic_printk(APIC_VERBOSE,
-                                    "mapped IOAPIC to %016lx (%016lx)\n",
-                                    __fix_to_virt(idx), ioapic_phys);
-                        idx++;
-
-                        if (ioapic_res != NULL) {
-                                ioapic_res->start = ioapic_phys;
-                                ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
-                                ioapic_res++;
-                        }
-                }
-        }
 }
 
 /*
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index d4f5286101a..c6de7854ac6 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -35,6 +35,7 @@
 #ifdef CONFIG_ACPI
 #include <acpi/acpi_bus.h>
 #endif
+#include <linux/bootmem.h>
 
 #include <asm/idle.h>
 #include <asm/io.h>
@@ -2288,3 +2289,92 @@ void __init setup_ioapic_dest(void)
 }
 #endif
 
+#define IOAPIC_RESOURCE_NAME_SIZE 11
+
+static struct resource *ioapic_resources;
+
+static struct resource * __init ioapic_setup_resources(void)
+{
+        unsigned long n;
+        struct resource *res;
+        char *mem;
+        int i;
+
+        if (nr_ioapics <= 0)
+                return NULL;
+
+        n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
+        n *= nr_ioapics;
+
+        mem = alloc_bootmem(n);
+        res = (void *)mem;
+
+        if (mem != NULL) {
+                memset(mem, 0, n);
+                mem += sizeof(struct resource) * nr_ioapics;
+
+                for (i = 0; i < nr_ioapics; i++) {
+                        res[i].name = mem;
+                        res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                        sprintf(mem,  "IOAPIC %u", i);
+                        mem += IOAPIC_RESOURCE_NAME_SIZE;
+                }
+        }
+
+        ioapic_resources = res;
+
+        return res;
+}
+
+void __init ioapic_init_mappings(void)
+{
+        unsigned long ioapic_phys, idx = FIX_IO_APIC_BASE_0;
+        struct resource *ioapic_res;
+        int i;
+
+        ioapic_res = ioapic_setup_resources();
+        for (i = 0; i < nr_ioapics; i++) {
+                if (smp_found_config) {
+                        ioapic_phys = mp_ioapics[i].mpc_apicaddr;
+                } else {
+                        ioapic_phys = (unsigned long)
+                                alloc_bootmem_pages(PAGE_SIZE);
+                        ioapic_phys = __pa(ioapic_phys);
+                }
+                set_fixmap_nocache(idx, ioapic_phys);
+                apic_printk(APIC_VERBOSE,
+                            "mapped IOAPIC to %016lx (%016lx)\n",
+                            __fix_to_virt(idx), ioapic_phys);
+                idx++;
+
+                if (ioapic_res != NULL) {
+                        ioapic_res->start = ioapic_phys;
+                        ioapic_res->end = ioapic_phys + (4 * 1024) - 1;
+                        ioapic_res++;
+                }
+        }
+}
+
+static int __init ioapic_insert_resources(void)
+{
+        int i;
+        struct resource *r = ioapic_resources;
+
+        if (!r) {
+                printk(KERN_ERR
+                       "IO APIC resources could be not be allocated.\n");
+                return -1;
+        }
+
+        for (i = 0; i < nr_ioapics; i++) {
+                insert_resource(&iomem_resource, r);
+                r++;
+        }
+
+        return 0;
+}
+
+/* Insert the IO APIC resources after PCI initialization has occured to handle
+ * IO APICS that are mapped in on a BAR in PCI space. */
+late_initcall(ioapic_insert_resources);
+
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index a84a4efc7fe..bcb5f3aaa09 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -433,6 +433,7 @@ void __init setup_arch(char **cmdline_p)
         if (smp_found_config)
                 get_smp_config();
         init_apic_mappings();
+        ioapic_init_mappings();
 
         /*
          * We trust e820 completely. No explicit ROM probing in memory.