From owner-dev-commits-src-branches@freebsd.org Mon Jun 7 00:40:16 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3909B6433A5; Mon, 7 Jun 2021 00:40:16 +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 4FyvfS0Ckvz4rS2; Mon, 7 Jun 2021 00:40:15 +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 B13C35517; Mon, 7 Jun 2021 00:40:15 +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 1570eFaJ064307; Mon, 7 Jun 2021 00:40:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1570eFrv064301; Mon, 7 Jun 2021 00:40:15 GMT (envelope-from git) Date: Mon, 7 Jun 2021 00:40:15 GMT Message-Id: <202106070040.1570eFrv064301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: a1ef0386c94f - stable/13 - Fix up macro use in lim_cur MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1ef0386c94f9e2aa42f4443ea04d8f6c7931aff Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2021 00:40:16 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a1ef0386c94f9e2aa42f4443ea04d8f6c7931aff commit a1ef0386c94f9e2aa42f4443ea04d8f6c7931aff Author: Mateusz Guzik AuthorDate: 2021-05-29 17:46:37 +0000 Commit: Mateusz Guzik CommitDate: 2021-06-07 00:34:55 +0000 Fix up macro use in lim_cur (cherry picked from commit dde5c031ed0d93d080442b26133e9ea800bbcd22) --- sys/sys/resourcevar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h index e83b170ca291..d1c9e6d4985f 100644 --- a/sys/sys/resourcevar.h +++ b/sys/sys/resourcevar.h @@ -135,7 +135,7 @@ rlim_t lim_cur(struct thread *td, int which); int _which = (which); \ if (__builtin_constant_p(which) && which != RLIMIT_DATA && \ which != RLIMIT_STACK && which != RLIMIT_VMEM) { \ - _rlim = td->td_limit->pl_rlimit[which].rlim_cur; \ + _rlim = _td->td_limit->pl_rlimit[_which].rlim_cur; \ } else { \ _rlim = lim_cur(_td, _which); \ } \