diff options
| author |   Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2016-12-12 23:18:29 -0500 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2016-12-15 11:32:32 +0100 |
| commit | aec03f89e905dca9ce4b061e03ee1da3a3eb3432 (patch) | |
| tree | b6da0a16933419e0298371c8108e209b8d77865d /drivers/acpi/numa.c | |
| parent | x86/acpi: Use proper macro for invalid node (diff) | |
| download | linux-dev-aec03f89e905dca9ce4b061e03ee1da3a3eb3432.tar.xz linux-dev-aec03f89e905dca9ce4b061e03ee1da3a3eb3432.zip | |
ACPI/NUMA: Do not map pxm to node when NUMA is turned off
acpi_map_pxm_to_node() unconditially maps nodes even when NUMA is turned
off. So acpi_get_node() might return a node > 0, which is fatal when NUMA
is disabled as the rest of the kernel assumes that only node 0 exists.
Expose numa_off to the acpi code and return NUMA_NO_NODE when it's set.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: fenghua.yu@intel.com
Cc: tony.luck@intel.com
Cc: linux-ia64@vger.kernel.org
Cc: catalin.marinas@arm.com
Cc: rjw@rjwysocki.net
Cc: will.deacon@arm.com
Cc: linux-acpi@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1481602709-18260-1-git-send-email-boris.ostrovsky@oracle.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/acpi/numa.c')
| -rw-r--r-- | drivers/acpi/numa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index ce3a7a16f03f..edb0c79f7c64 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c @@ -70,7 +70,7 @@ int acpi_map_pxm_to_node(int pxm) { int node; - if (pxm < 0 || pxm >= MAX_PXM_DOMAINS) + if (pxm < 0 || pxm >= MAX_PXM_DOMAINS || numa_off) return NUMA_NO_NODE; node = pxm_to_node_map[pxm]; |