git: 7dc5416497a6 - main - benchmarks/stress-ng: fix build on -CURRENT
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Jan 2022 10:36:19 UTC
The branch main has been updated by se:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7dc5416497a6d04bb85c5ded6b4983fb46b199b4
commit 7dc5416497a6d04bb85c5ded6b4983fb46b199b4
Author: Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2022-01-03 10:33:58 +0000
Commit: Stefan Eßer <se@FreeBSD.org>
CommitDate: 2022-01-03 10:33:58 +0000
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(-)
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)