x86, NUMA: rename srat_64.c to srat.c

Rename srat_64.c to srat.c.  This is to prepare for unification of
NUMA init paths between 32 and 64bit.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>

1 files changed, 0 insertions, 184 deletions

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
deleted file mode 100644
index 9994d2cacf72..000000000000
--- a/arch/x86/mm/srat_64.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * ACPI 3.0 based NUMA setup
- * Copyright 2004 Andi Kleen, SuSE Labs.
- *
- * Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
- *
- * Called from acpi_numa_init while reading the SRAT and SLIT tables.
- * Assumes all memory regions belonging to a single proximity domain
- * are in one chunk. Holes between them will be included in the node.
- */
-
-#include <linux/kernel.h>
-#include <linux/acpi.h>
-#include <linux/mmzone.h>
-#include <linux/bitmap.h>
-#include <linux/module.h>
-#include <linux/topology.h>
-#include <linux/bootmem.h>
-#include <linux/memblock.h>
-#include <linux/mm.h>
-#include <asm/proto.h>
-#include <asm/numa.h>
-#include <asm/e820.h>
-#include <asm/apic.h>
-#include <asm/uv/uv.h>
-
-int acpi_numa __initdata;
-
-static __init int setup_node(int pxm)
-{
-        return acpi_map_pxm_to_node(pxm);
-}
-
-static __init void bad_srat(void)
-{
-        printk(KERN_ERR "SRAT: SRAT not used.\n");
-        acpi_numa = -1;
-}
-
-static __init inline int srat_disabled(void)
-{
-        return acpi_numa < 0;
-}
-
-/* Callback for SLIT parsing */
-void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
-{
-        int i, j;
-
-        for (i = 0; i < slit->locality_count; i++)
-                for (j = 0; j < slit->locality_count; j++)
-                        numa_set_distance(pxm_to_node(i), pxm_to_node(j),
-                                slit->entry[slit->locality_count * i + j]);
-}
-
-/* Callback for Proximity Domain -> x2APIC mapping */
-void __init
-acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
-{
-        int pxm, node;
-        int apic_id;
-
-        if (srat_disabled())
-                return;
-        if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
-                bad_srat();
-                return;
-        }
-        if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-                return;
-        pxm = pa->proximity_domain;
-        node = setup_node(pxm);
-        if (node < 0) {
-                printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
-                bad_srat();
-                return;
-        }
-
-        apic_id = pa->apic_id;
-        if (apic_id >= MAX_LOCAL_APIC) {
-                printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
-                return;
-        }
-        set_apicid_to_node(apic_id, node);
-        node_set(node, numa_nodes_parsed);
-        acpi_numa = 1;
-        printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
-               pxm, apic_id, node);
-}
-
-/* Callback for Proximity Domain -> LAPIC mapping */
-void __init
-acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
-{
-        int pxm, node;
-        int apic_id;
-
-        if (srat_disabled())
-                return;
-        if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
-                bad_srat();
-                return;
-        }
-        if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
-                return;
-        pxm = pa->proximity_domain_lo;
-        node = setup_node(pxm);
-        if (node < 0) {
-                printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
-                bad_srat();
-                return;
-        }
-
-        if (get_uv_system_type() >= UV_X2APIC)
-                apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
-        else
-                apic_id = pa->apic_id;
-
-        if (apic_id >= MAX_LOCAL_APIC) {
-                printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
-                return;
-        }
-
-        set_apicid_to_node(apic_id, node);
-        node_set(node, numa_nodes_parsed);
-        acpi_numa = 1;
-        printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
-               pxm, apic_id, node);
-}
-
-#ifdef CONFIG_MEMORY_HOTPLUG
-static inline int save_add_info(void) {return 1;}
-#else
-static inline int save_add_info(void) {return 0;}
-#endif
-
-/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
-void __init
-acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
-{
-        unsigned long start, end;
-        int node, pxm;
-
-        if (srat_disabled())
-                return;
-        if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
-                bad_srat();
-                return;
-        }
-        if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
-                return;
-
-        if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
-                return;
-        start = ma->base_address;
-        end = start + ma->length;
-        pxm = ma->proximity_domain;
-        node = setup_node(pxm);
-        if (node < 0) {
-                printk(KERN_ERR "SRAT: Too many proximity domains.\n");
-                bad_srat();
-                return;
-        }
-
-        if (numa_add_memblk(node, start, end) < 0) {
-                bad_srat();
-                return;
-        }
-
-        printk(KERN_INFO "SRAT: Node %u PXM %u %lx-%lx\n", node, pxm,
-               start, end);
-}
-
-void __init acpi_numa_arch_fixup(void) {}
-
-int __init x86_acpi_numa_init(void)
-{
-        int ret;
-
-        ret = acpi_numa_init();
-        if (ret < 0)
-                return ret;
-        return srat_disabled() ? -EINVAL : 0;
-}