From nobody Mon Oct 17 20:41:24 2022 X-Original-To: dev-commits-src-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 4Mrpn0601qz4fQf3; Mon, 17 Oct 2022 20:41:24 +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 4Mrpn05XPwz45Qk; Mon, 17 Oct 2022 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039284; 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=p9hE9rUGb5d04SCN5M5hD/Jysu+eKdagXPY4IZbnM8c=; b=fwF52yfSevxc38QvffMty8vJwQHSl/vYWYFmvK6a/0rTUp/w9mUcoGdPhl1YwzmsM5W4U9 CKMnpSUd/g8El5FSZwXV0/y4qPFgdOrbMKFyVlYoqwXzVPKq6ZEPo7ets6ddLoOm2Q5VRu prSh1VeBGFjU1vyPoEszHUaujaXBfyod46SC8svNKEbCTlmPUbzMuFglDd4FNRGoqEmFyU EjuERc5ikMFy1blzmAR7kb+zg2wIVaZ98e7UaBQ+1fnOtOAhknzx5JB05VU9aBB+O+Ihlo 6LSN/jZaP9Zz8XfQgXmW1UuChf/1CVfHqMfS0ki6an/BqiDW87NbKMC6shQpng== 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 4Mrpn04cHYzxKK; Mon, 17 Oct 2022 20:41:24 +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 29HKfOC9096208; Mon, 17 Oct 2022 20:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKfO76096207; Mon, 17 Oct 2022 20:41:24 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:41:24 GMT Message-Id: <202210172041.29HKfO76096207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fe9e99ff9c9d - stable/13 - systm.h: change pause from #define to inline function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fe9e99ff9c9d9028dccb1bb1537af46beabcb691 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039284; 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=p9hE9rUGb5d04SCN5M5hD/Jysu+eKdagXPY4IZbnM8c=; b=MEB8wJ0BYms1KEImpOjUli/3GS+8gFWBpX0QmWaFOFt+bm0XkwcRO3PhgxsAyvcHncMkvy SBWrH7hg2VwCWqEOId5QHjdsTsMebDaefZmjtLHY2msV9Mw7hcTue32DyIHy/um9jfa+nm IN4Aec40MX7UjHxaMEVeU6EdPZSRpPl8ugxjIIX6085HSKpy2/5X+KIvNwUqt6fTq9oUFJ CdzmpSGvXBVWFo0D7GlNaRkE07K8gkmtIK6b4NtEWTGTxoCnupsx6YJaIjfaUY/J+D1lkz dch2KMUCnsZiXYphaetTGYpT6psHk8mFs0+aWvJoBFvY2XULMkgAP6rgTQlJLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666039284; a=rsa-sha256; cv=none; b=IW5UdX9eikiO1tvFgFe3IdhTME0GvpYstZe//mrYDdFXoCrm8dkbIaAM+zKnc3Haw4zGn/ TB+y/NG8EQ9WCxhwp+Ej7Z5ibsN4wYZe/UOGxwF0CIF02CUriuco68dG7k14TFViM05oRx m90A46UHtQieSFZOfBa0ZV7jGYAqjULFhVaw7ND9ZFe6sasa9IJ5/8lekwwx63W4m/DlvZ 9MZ5YWkCg10AxjrhpswxL+MXKwrrnT3IexOQ3tptcY76rR9B+4NkwIS2eazPX34MSwd26V 5bHD06QepreG4dlr2rYKhLDRP5yH76kdMBNA56GK7wsPEtftocL4eWlMn1rFRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fe9e99ff9c9d9028dccb1bb1537af46beabcb691 commit fe9e99ff9c9d9028dccb1bb1537af46beabcb691 Author: Bjoern A. Zeeb AuthorDate: 2022-09-08 00:04:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-17 20:37:02 +0000 systm.h: change pause from #define to inline function There are drivers are using (*pause)(x, y) function pointers and depending on how "pause" is used it gets replaced by pause_sbt causing compile time failures. Given "pause" is a generic enough name change it from a #define to an inline function to avoid replacements where it should not. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D36489 (cherry picked from commit 7ea1cac248574ed06c7823ffbfb9a60157240e57) --- sys/sys/systm.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/sys/systm.h b/sys/sys/systm.h index b2b84d0fc722..bccf88573991 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -428,8 +428,11 @@ int msleep_spin_sbt(const void * _Nonnull chan, struct mtx *mtx, 0, C_HARDCLOCK) int pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags); -#define pause(wmesg, timo) \ - pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK) +static __inline int +pause(const char *wmesg, int timo) +{ + return (pause_sbt(wmesg, tick_sbt * timo, 0, C_HARDCLOCK)); +} #define pause_sig(wmesg, timo) \ pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK | C_CATCH) #define tsleep(chan, pri, wmesg, timo) \