From nobody Tue Dec 28 17:04:48 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B1D8D1905B91; Tue, 28 Dec 2021 17:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JNgrJ39rsz4rZp; Tue, 28 Dec 2021 17:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4CD2B15157; Tue, 28 Dec 2021 17:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BSH4m3Q086779; Tue, 28 Dec 2021 17:04:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BSH4muW086778; Tue, 28 Dec 2021 17:04:48 GMT (envelope-from git) Date: Tue, 28 Dec 2021 17:04:48 GMT Message-Id: <202112281704.1BSH4muW086778@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Luca Pizzamiglio Subject: git: cbb2589f4e49 - main - benchmarks/stress-ng: fix build on CURRENT, List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pizzamig X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbb2589f4e49eff4f9ae124be44dbeea2fbc7399 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640711088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ij3t6ycGQsoKjPsX7uQbtPhVYd0YhYP5RWx9OSSPeuk=; b=oJCzzAzamW46UMEzSL519Q9XdUU9HyfgoaXC/58H2yQDMw1VAn/pSdME6rHNbapUvYIIPe penj+A6TmLxXa+TS+2vgPnUUK3g43oD4OkuIYerUy8aQ5JiB3lCuADmumZK3KWLIzNeHgI lTHpC6e1Bd2S8cvMR/apxXsrdfr188x6+juMquByXqMt/117j5mdcuNktlkKGS4fJ55tLk mRZVU/iTp9PzAA5UBRyjS+xljCWFig7J1WgsMHczhNLiueblG/UhAkxow7pa4hktvychtW kjCnDtgEoFQA1SV4k8NE0Y0VHVLeR00Vv/IKiUt0qlQwrD0byAvjvKQbxlzsPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640711088; a=rsa-sha256; cv=none; b=ZKFp2IzW5zMWEyD7ChcvZpb4y+hKSmQ+2RBbZQpHkMtjUAD0kQAxGce2/x461nOXHjAs4R Xd4LBn0AuMLl91JD7GcbaRRkK5Nl7fLcrtLJW2BNl45JA24nEyqd1rw7lvQLQBhY+LJaGV wZs7qA0/GrWR5j0MG+hlBAo+C/p7n2qYqPR+N5eA91qLgF7B4yEV7RpivZZ4NEcVq4AEqu DknxHinfp/nN/3zHPE2aPAR6HOAsSkQiRbtx6fgnaFCMMeT4wPIBMjhuFbQr0qpg2Wtse8 5OfoZPGZM1MbxKg6AfcWpo9NSKiikAAuCmanWvXAff4N8mtpH9aHLFvNTGqz0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pizzamig: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbb2589f4e49eff4f9ae124be44dbeea2fbc7399 commit cbb2589f4e49eff4f9ae124be44dbeea2fbc7399 Author: Luca Pizzamiglio AuthorDate: 2021-12-28 17:01:32 +0000 Commit: Luca Pizzamiglio 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)