git: cbb2589f4e49 - main - benchmarks/stress-ng: fix build on CURRENT,
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Dec 2021 17:04:48 UTC
The branch main has been updated by pizzamig:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cbb2589f4e49eff4f9ae124be44dbeea2fbc7399
commit cbb2589f4e49eff4f9ae124be44dbeea2fbc7399
Author: Luca Pizzamiglio <pizzamig@FreeBSD.org>
AuthorDate: 2021-12-28 17:01:32 +0000
Commit: Luca Pizzamiglio <pizzamig@FreeBSD.org>
CommitDate: 2021-12-28 17:01:32 +0000
benchmarks/stress-ng: fix build on CURRENT,
In CURRENT, the initial configuration detects now support for the
scheduler affinity, enabling the build of an additional stressor.
In this stressor, the CPU_OR macro has 3 arguments (Linux implementation),
while on FreeBSD it has only 2 arguments.
This patch provides the fix
No bumprevision is provided, because it's only fixing CURRENT where the
build was failing.
---
benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
new file mode 100644
index 000000000000..0beb2950f2b2
--- /dev/null
+++ b/benchmarks/stress-ng/files/patch-stress-tlb-shootdown.c
@@ -0,0 +1,11 @@
+--- stress-tlb-shootdown.c.orig 2021-12-28 15:45:13 UTC
++++ stress-tlb-shootdown.c
+@@ -64,7 +64,7 @@ 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);
++ CPU_OR(&proc_mask, &proc_mask_initial);
+
+ tlb_procs = max_cpus;
+ if (tlb_procs > MAX_TLB_PROCS)