Commit 264d2527 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

driver core: Fix test_async_driver_probe if NUMA is disabled

Since commit 57ea974f ("driver core: Rewrite test_async_driver_probe
to cover serialization and NUMA affinity"), running the test with NUMA
disabled results in warning messages similar to the following.

test_async_driver test_async_driver.12: NUMA node mismatch -1 != 0

If CONFIG_NUMA=n, dev_to_node(dev) returns -1, and numa_node_id()
returns 0. Both are widely used, so it appears risky to change return
values. Augment the check with IS_ENABLED(CONFIG_NUMA) instead
to fix the problem.

Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Fixes: 57ea974f ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: stable <stable@vger.kernel.org>
Acked-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Link: https://lore.kernel.org/r/20191127202453.28087-1-linux@roeck-us.netSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39cc539f
...@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev) ...@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)
* performing an async init on that node. * performing an async init on that node.
*/ */
if (dev->driver->probe_type == PROBE_PREFER_ASYNCHRONOUS) { if (dev->driver->probe_type == PROBE_PREFER_ASYNCHRONOUS) {
if (dev_to_node(dev) != numa_node_id()) { if (IS_ENABLED(CONFIG_NUMA) &&
dev_to_node(dev) != numa_node_id()) {
dev_warn(dev, "NUMA node mismatch %d != %d\n", dev_warn(dev, "NUMA node mismatch %d != %d\n",
dev_to_node(dev), numa_node_id()); dev_to_node(dev), numa_node_id());
atomic_inc(&warnings); atomic_inc(&warnings);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment