svn commit: r366747 - stable/12/usr.bin/cpuset

[Andrey V. Elsukov]

Author: ae
Date: Fri Oct 16 08:56:20 2020
New Revision: 366747
URL: https://svnweb.freebsd.org/changeset/base/366747

Log:
  MFC r366568:
    Fix EINVAL message when CPU binding information is requested for IRQ.
  
    `cpuset -g -x N` along with requested information always prints
    message `cpuset: getdomain: Invalid argument'. The EINVAL is returned
    from kern_cpuset_getdomain(), since it doesn't expect CPU_LEVEL_WHICH
    and CPU_WHICH_IRQ parameters.
  
    To fix the error, do not call cpuset_getdomain() when `-x' is specified.

Modified:
  stable/12/usr.bin/cpuset/cpuset.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/cpuset/cpuset.c
==============================================================================
--- stable/12/usr.bin/cpuset/cpuset.c	Fri Oct 16 06:42:25 2020	(r366746)
+++ stable/12/usr.bin/cpuset/cpuset.c	Fri Oct 16 08:56:20 2020	(r366747)
@@ -253,7 +253,7 @@ printaffinity(void)
 	printf("%s %jd%s mask: ", whichnames[which], (intmax_t)id,
 	    levelnames[level]);
 	printset((struct bitset *)&mask, CPU_SETSIZE);
-	if (dflag)
+	if (dflag || xflag)
 		goto out;
 	if (cpuset_getdomain(level, which, id, sizeof(domain), &domain,
 	    &policy) != 0)