diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /net/haproxy33/files/patch-src_cpuset.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'net/haproxy33/files/patch-src_cpuset.c')
| -rw-r--r-- | net/haproxy33/files/patch-src_cpuset.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/haproxy33/files/patch-src_cpuset.c b/net/haproxy33/files/patch-src_cpuset.c new file mode 100644 index 000000000000..caf6945ee14c --- /dev/null +++ b/net/haproxy33/files/patch-src_cpuset.c @@ -0,0 +1,14 @@ +--- src/cpuset.c.orig 2025-10-18 09:24:05 UTC ++++ src/cpuset.c +@@ -51,7 +51,11 @@ void ha_cpuset_and(struct hap_cpuset *dst, struct hap_ + CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset); + + #elif defined(CPUSET_USE_FREEBSD_CPUSET) ++#if defined(CPU_ALLOC) ++ CPU_AND(&dst->cpuset, &dst->cpuset, &src->cpuset); ++#else + CPU_AND(&dst->cpuset, &src->cpuset); ++#endif + + #elif defined(CPUSET_USE_ULONG) + dst->cpuset &= src->cpuset; |