diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:40:39 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 13:40:39 +0200 |
| commit | d85f4eb6993d8c743ac89e427479cbe9efc14683 (patch) | |
| tree | 19721887e8b2c9823d55e0e1a5887f244b8c2634 /drivers/of | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| parent | 4bac6fa73db77d4ff49a965a7c6dc69d9e235e5f (diff) | |
| download | op-kernel-dev-d85f4eb6993d8c743ac89e427479cbe9efc14683.zip op-kernel-dev-d85f4eb6993d8c743ac89e427479cbe9efc14683.tar.gz | |
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
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/of_numa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/of_numa.c b/drivers/of/of_numa.c index 0f2784b..ed5a097 100644 --- a/drivers/of/of_numa.c +++ b/drivers/of/of_numa.c @@ -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; } |
