Skip to content

Commit 264d252

Browse files
groeckgregkh
authored andcommitted
driver core: Fix test_async_driver_probe if NUMA is disabled
Since commit 57ea974 ("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 <[email protected]> Fixes: 57ea974 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity") Signed-off-by: Guenter Roeck <[email protected]> Cc: stable <[email protected]> Acked-by: Alexander Duyck <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 39cc539 commit 264d252

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/base/test/test_async_driver_probe.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)
4444
* performing an async init on that node.
4545
*/
4646
if (dev->driver->probe_type == PROBE_PREFER_ASYNCHRONOUS) {
47-
if (dev_to_node(dev) != numa_node_id()) {
47+
if (IS_ENABLED(CONFIG_NUMA) &&
48+
dev_to_node(dev) != numa_node_id()) {
4849
dev_warn(dev, "NUMA node mismatch %d != %d\n",
4950
dev_to_node(dev), numa_node_id());
5051
atomic_inc(&warnings);

0 commit comments

Comments
 (0)