From e1a35767c1afa96d656d07db8d873267cff7aeff Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Wed, 20 Oct 2021 11:58:01 +1100 Subject: [PATCH] util: fix util_cpu_detect_once() build on OpenBSD Correct type for sysctl argument to fix the build. ../src/util/u_cpu_detect.c:631:29: error: incompatible pointer types passing 'int *' to parameter of type 'size_t *' (aka 'unsigned long *') [-Werror,-Wincompatible-pointer-types] sysctl(mib, 2, &ncpu, &len, NULL, 0); ^~~~ Fixes: 5623c75e40b ("util: Fix setting nr_cpus on some BSD variants") Signed-off-by: Jonathan Gray Reviewed-by: Ilia Mirkin Part-of: (cherry picked from commit afece589dc6c5227ac61502f809184090fe83da1) --- .pick_status.json | 2 +- src/util/u_cpu_detect.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fd91eb8d518..44668261f34 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3982,7 +3982,7 @@ "description": "util: fix util_cpu_detect_once() build on OpenBSD", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5623c75e40b38017873df09954b5f65dc84dcde5" }, diff --git a/src/util/u_cpu_detect.c b/src/util/u_cpu_detect.c index 0b329f1b293..4cf89d64743 100644 --- a/src/util/u_cpu_detect.c +++ b/src/util/u_cpu_detect.c @@ -625,7 +625,7 @@ util_cpu_detect_once(void) if (available_cpus == 0) { const int mib[] = { CTL_HW, HW_NCPUONLINE }; int ncpu; - int len = sizeof(ncpu); + size_t len = sizeof(ncpu); sysctl(mib, 2, &ncpu, &len, NULL, 0); available_cpus = ncpu;