Commit 312521d0 authored by Robert Richter's avatar Robert Richter Committed by Rafael J. Wysocki

ACPI / NUMA: Move acpi_numa_arch_fixup() to ia64 only

Since acpi_numa_arch_fixup() is only used in arch ia64, move it there
to make a generic interface easier. This avoids empty function stubs
or some complex kconfig options for x86 and arm64.
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Reviewed-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 258cb74b
...@@ -140,6 +140,9 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus) ...@@ -140,6 +140,9 @@ static inline void per_cpu_scan_finalize(int min_cpus, int reserve_cpus)
} }
} }
} }
extern void acpi_numa_fixup(void);
#endif /* CONFIG_ACPI_NUMA */ #endif /* CONFIG_ACPI_NUMA */
#endif /*__KERNEL__*/ #endif /*__KERNEL__*/
......
...@@ -524,7 +524,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) ...@@ -524,7 +524,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
return 0; return 0;
} }
void __init acpi_numa_arch_fixup(void) void __init acpi_numa_fixup(void)
{ {
int i, j, node_from, node_to; int i, j, node_from, node_to;
......
...@@ -552,6 +552,7 @@ setup_arch (char **cmdline_p) ...@@ -552,6 +552,7 @@ setup_arch (char **cmdline_p)
early_acpi_boot_init(); early_acpi_boot_init();
# ifdef CONFIG_ACPI_NUMA # ifdef CONFIG_ACPI_NUMA
acpi_numa_init(); acpi_numa_init();
acpi_numa_fixup();
# ifdef CONFIG_ACPI_HOTPLUG_CPU # ifdef CONFIG_ACPI_HOTPLUG_CPU
prefill_possible_map(); prefill_possible_map();
# endif # endif
......
...@@ -212,8 +212,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) ...@@ -212,8 +212,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
return -1; return -1;
} }
void __init acpi_numa_arch_fixup(void) {}
int __init x86_acpi_numa_init(void) int __init x86_acpi_numa_init(void)
{ {
int ret; int ret;
......
...@@ -324,8 +324,6 @@ int __init acpi_numa_init(void) ...@@ -324,8 +324,6 @@ int __init acpi_numa_init(void)
/* SLIT: System Locality Information Table */ /* SLIT: System Locality Information Table */
acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit); acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);
acpi_numa_arch_fixup();
if (cnt < 0) if (cnt < 0)
return cnt; return cnt;
else if (!parsed_numa_memblks) else if (!parsed_numa_memblks)
......
...@@ -237,7 +237,6 @@ void acpi_numa_slit_init (struct acpi_table_slit *slit); ...@@ -237,7 +237,6 @@ void acpi_numa_slit_init (struct acpi_table_slit *slit);
void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa); void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa); void acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa);
int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma); int acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma);
void acpi_numa_arch_fixup(void);
#ifndef PHYS_CPUID_INVALID #ifndef PHYS_CPUID_INVALID
typedef u32 phys_cpuid_t; typedef u32 phys_cpuid_t;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment