mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'acpi-numa'
* acpi-numa: ACPI / NUMA: Enable ACPI based NUMA on ARM64 arm64, ACPI, NUMA: NUMA support based on SRAT and SLIT ACPI / processor: Add acpi_map_madt_entry() ACPI / NUMA: Improve SRAT error detection and add messages ACPI / NUMA: Move acpi_numa_memory_affinity_init() to drivers/acpi/numa.c ACPI / NUMA: remove unneeded acpi_numa=1 ACPI / NUMA: move bad_srat() and srat_disabled() to drivers/acpi/numa.c x86 / ACPI / NUMA: cleanup acpi_numa_processor_affinity_init() arm64, NUMA: Cleanup NUMA disabled messages arm64, NUMA: rework numa_add_memblk() ACPI / NUMA: move acpi_numa_slit_init() to drivers/acpi/numa.c ACPI / NUMA: Move acpi_numa_arch_fixup() to ia64 only ACPI / NUMA: remove duplicate NULL check ACPI / NUMA: Replace ACPI_DEBUG_PRINT() with pr_debug() ACPI / NUMA: Use pr_fmt() instead of printk
This commit is contained in:
commit
d85f4eb699
19 changed files with 369 additions and 192 deletions
|
|
@ -91,8 +91,8 @@ static int __init of_numa_parse_memory_nodes(void)
|
|||
pr_debug("NUMA: base = %llx len = %llx, node = %u\n",
|
||||
rsrc.start, rsrc.end - rsrc.start + 1, nid);
|
||||
|
||||
r = numa_add_memblk(nid, rsrc.start,
|
||||
rsrc.end - rsrc.start + 1);
|
||||
|
||||
r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
|
||||
if (r)
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue