diff options
author | Hanjun Guo <hanjun.guo@linaro.org> | 2016-05-24 18:35:35 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-30 08:27:07 -0400 |
commit | 6525afdf53b39968f1a109b1ce1607ca6c98d300 (patch) | |
tree | 5ab5e037f2b2e9bd666c12107b136911eb30dd9e /arch/x86/mm | |
parent | 312521d0543513f37f0badb4efc7bfed2d99672e (diff) |
ACPI / NUMA: move acpi_numa_slit_init() to drivers/acpi/numa.c
Identical implementations of acpi_numa_slit_init() are used by both
x86 and follow-on arm64 support. Move it to drivers/acpi/numa.c, and
guard with CONFIG_X86 || CONFIG_ARM64 because ia64 has its own
architecture specific implementation.
No code change.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/srat.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c index 90b6ed9a00dc..f242a11df488 100644 --- a/arch/x86/mm/srat.c +++ b/arch/x86/mm/srat.c | |||
@@ -42,33 +42,6 @@ static __init inline int srat_disabled(void) | |||
42 | return acpi_numa < 0; | 42 | return acpi_numa < 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | /* | ||
46 | * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for | ||
47 | * I/O localities since SRAT does not list them. I/O localities are | ||
48 | * not supported at this point. | ||
49 | */ | ||
50 | void __init acpi_numa_slit_init(struct acpi_table_slit *slit) | ||
51 | { | ||
52 | int i, j; | ||
53 | |||
54 | for (i = 0; i < slit->locality_count; i++) { | ||
55 | const int from_node = pxm_to_node(i); | ||
56 | |||
57 | if (from_node == NUMA_NO_NODE) | ||
58 | continue; | ||
59 | |||
60 | for (j = 0; j < slit->locality_count; j++) { | ||
61 | const int to_node = pxm_to_node(j); | ||
62 | |||
63 | if (to_node == NUMA_NO_NODE) | ||
64 | continue; | ||
65 | |||
66 | numa_set_distance(from_node, to_node, | ||
67 | slit->entry[slit->locality_count * i + j]); | ||
68 | } | ||
69 | } | ||
70 | } | ||
71 | |||
72 | /* Callback for Proximity Domain -> x2APIC mapping */ | 45 | /* Callback for Proximity Domain -> x2APIC mapping */ |
73 | void __init | 46 | void __init |
74 | acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) | 47 | acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) |