mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
driver core: Fix test_async_driver_probe if NUMA is disabled
commit264d25275a
upstream. Since commit57ea974fb8
("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:57ea974fb8
("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity") Signed-off-by: Guenter Roeck <linux@roeck-us.net> Cc: stable <stable@vger.kernel.org> Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Link: https://lore.kernel.org/r/20191127202453.28087-1-linux@roeck-us.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3811bd2b93
commit
9ba7636fdb
1 changed files with 2 additions and 1 deletions
|
@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)
|
|||
* performing an async init on that node.
|
||||
*/
|
||||
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_to_node(dev), numa_node_id());
|
||||
atomic_inc(&warnings);
|
||||
|
|
Loading…
Reference in a new issue