[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 12 Dec 2016 14:29:53 -0500
From: Boris Ostrovsky <boris.ostrovsky@...cle.com>
To: rjw@...ysocki.net, len.brown@...el.com, pavel@....cz,
tglx@...utronix.de, mingo@...hat.com, hpa@...or.com
Cc: linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org,
x86@...nel.org, Boris Ostrovsky <boris.ostrovsky@...cle.com>
Subject: [PATCH] ACPI/NUMA: Do not map pxm to node when NUMA is turned off
Otherwise we may unexpectedly reference a non-zero node via, for example,
acpi_get_node() while other parts of the kernel assume that only node 0
(which is what NUMA_NO_NODE is supposed to be converted to) is
available.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@...cle.com>
---
drivers/acpi/numa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index ce3a7a1..edb0c79 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];
--
1.8.3.1
Powered by blists - more mailing lists