Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/ia64/include/asm/acpi.h

+3 −0
Original line number Diff line number Diff line
@@ -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 /*__KERNEL__*/

arch/ia64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
	return 0;

}



void __init acpi_numa_arch_fixup(void)

void __init acpi_numa_fixup(void)

{

	int i, j, node_from, node_to;

arch/ia64/kernel/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ setup_arch (char **cmdline_p) 
	early_acpi_boot_init();

# ifdef CONFIG_ACPI_NUMA

	acpi_numa_init();

	acpi_numa_fixup();

#  ifdef CONFIG_ACPI_HOTPLUG_CPU

	prefill_possible_map();

#  endif

arch/x86/mm/srat.c

+0 −2
Original line number Diff line number Diff line
@@ -212,8 +212,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
	return -1;

}



void __init acpi_numa_arch_fixup(void) {}



int __init x86_acpi_numa_init(void)

{

	int ret;

drivers/acpi/numa.c

+0 −2
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ int __init acpi_numa_init(void) 
	/* SLIT: System Locality Information Table */

	acpi_table_parse(ACPI_SIG_SLIT, acpi_parse_slit);



	acpi_numa_arch_fixup();



	if (cnt < 0)

		return cnt;

	else if (!parsed_numa_memblks)