From 7dc5416497a6d04bb85c5ded6b4983fb46b199b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Mon, 3 Jan 2022 11:33:58 +0100 Subject: benchmarks/stress-ng: fix build on -CURRENT The CPU_SET macros in -CURRENT have been made compatible with GLIBC. A simple test for the new signature of CPU_AND, CPU_OR, ... is the existence of a CPU_ALLOC macro. Approved by: portmgr (implicit) MFH: 2022Q1 --- benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c') diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c index 0beb2950f2b2..d54609e2fc7f 100644 --- a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c +++ b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c @@ -1,11 +1,14 @@ ---- stress-tlb-shootdown.c.orig 2021-12-28 15:45:13 UTC +--- stress-tlb-shootdown.c.orig 2021-12-19 20:49:35 UTC +++ stress-tlb-shootdown.c -@@ -64,7 +64,7 @@ static int stress_tlb_shootdown(const stress_args_t *a +@@ -64,7 +64,11 @@ static int stress_tlb_shootdown(const stress_args_t *a const int32_t max_cpus = stress_get_processors_configured(); CPU_ZERO(&proc_mask); -- CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask); ++#ifdef CPU_ALLOC + CPU_OR(&proc_mask, &proc_mask_initial, &proc_mask); ++#else + CPU_OR(&proc_mask, &proc_mask_initial); ++#endif tlb_procs = max_cpus; if (tlb_procs > MAX_TLB_PROCS) -- cgit v1.2.3