Skip to content

Commit b7d6094

Browse files
geliangtangKernel Patches Daemon
authored and
Kernel Patches Daemon
committed
selftests: mqueue: drop duplicate min definition
Drop duplicate macro min() definition in mq_perf_tests.c, use MIN() in sys/param.h instead. Signed-off-by: Geliang Tang <[email protected]>
1 parent 227a543 commit b7d6094

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/testing/selftests/mqueue/mq_perf_tests.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <sys/time.h>
3636
#include <sys/resource.h>
3737
#include <sys/stat.h>
38+
#include <sys/param.h>
3839
#include <mqueue.h>
3940
#include <popt.h>
4041
#include <error.h>
@@ -73,7 +74,6 @@ static char *usage =
7374
char *MAX_MSGS = "/proc/sys/fs/mqueue/msg_max";
7475
char *MAX_MSGSIZE = "/proc/sys/fs/mqueue/msgsize_max";
7576

76-
#define min(a, b) ((a) < (b) ? (a) : (b))
7777
#define MAX_CPUS 64
7878
char *cpu_option_string;
7979
int cpus_to_pin[MAX_CPUS];
@@ -551,7 +551,7 @@ int main(int argc, char *argv[])
551551
perror("sysconf(_SC_NPROCESSORS_ONLN)");
552552
exit(1);
553553
}
554-
cpus_online = min(MAX_CPUS, sysconf(_SC_NPROCESSORS_ONLN));
554+
cpus_online = MIN(MAX_CPUS, sysconf(_SC_NPROCESSORS_ONLN));
555555
cpu_set = CPU_ALLOC(cpus_online);
556556
if (cpu_set == NULL) {
557557
perror("CPU_ALLOC()");

0 commit comments

Comments
 (0)