From nobody Sat Jan 22 19:36:24 2022 X-Original-To: dev-commits-src-branches@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 7E438196B910; Sat, 22 Jan 2022 19:36:30 +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 4Jh61j3c1Xz3R5q; Sat, 22 Jan 2022 19:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642880190; 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=DbHPYpmocFNPr7k+JK1Pu1R+mufqNNb7MwolW8v64zg=; b=QerF+Rs+oZzYIzA1iKSkXCM/Ln9+FwfOlFOiEECensq5nzBlYRU/RjCS0HQ0v3ZWc/LXjm R2kDrHjj433SWZNhWZoPsO3Xg4Q8BShkzPJA2fEYus+k4LRAp4epJa1z0RPDgWo9eNoeta qer1EGi2sBVgudHMAgNoVrMcIhdeX2mi3v5WpxPLkbCBKDgGDFAkWpRHVUq9Wsi1WSU2Q6 cIdUDit/ZzM7S7nkcjUzBC9/EHW1L2BbmJAbrwrib6eJonhM2Ze/6CvURX2IkJXYFht9q5 tJ+n8ppcWQvu1Qy6vFcjxdxikKLwC2A+o508/ikM0TIw3aE5ZulxGjKqlLPHMA== 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 0787415035; Sat, 22 Jan 2022 19:36:25 +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 20MJaO8i099992; Sat, 22 Jan 2022 19:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20MJaO4u099991; Sat, 22 Jan 2022 19:36:24 GMT (envelope-from git) Date: Sat, 22 Jan 2022 19:36:24 GMT Message-Id: <202201221936.20MJaO4u099991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d93c8a4d5a3f - stable/13 - LinuxKPI: Convert schedule() to inlined function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642880187; 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=DbHPYpmocFNPr7k+JK1Pu1R+mufqNNb7MwolW8v64zg=; b=iRFu4rsJRl3kx9IEEZfsWHu9qX52MQlOQz7XMwSxBtFYLPp4qcvHF6z0W6noZc0Q6vQvMZ twxCDBWAOsd+ntvO1NMNSEu2snqoEQXTWbTDGIr31r2e0fhx1r3ww9F9K3fNMZX29aOV3F wMRILvXOs0j8FgaiHM6JQhhlFwkVFGFN0fSi3EZ0tGGd7e+ht2lOAr6o9ih6D5VN+k9Ell mS+XpP9BDf4tuE8eQjTkNcYLzTgrSV5uNYu1SR8bQ1Sv+hjJwVPU9Rke7ZbsV3BKDQsCrc aHzr13SrBpH4bltTIkxMUzMH90p+8Pd7+ZYSZ/RE5ZyAyKuT9k2+Vr3EOji76A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642880187; a=rsa-sha256; cv=none; b=yd9YY8LAnGPBMwclgJ7EP3yGD7zkA1kmewHPLDrhCJaGDMQrpnQacnnHdLOzEz5q7OhxdL OG6L9w1LYtKuDULbxoWH25o1R58KrV1rSL0NWRN9t9c4DciF8wWHpwSfO0LhGQMbU6wy4L kA6aANHdLm1TcN5o0yRDjGgpHLQYGs4zID8qeKtPVZTHV0F7hEGV/1Eeg49gDvFqwg2+D9 EdNvVZJJ2v4QYDEMWOAJgIf3PJxzyUBjc6NM4WODEYZ+ypoIkdSakGcT5L6Sr2o87nLptJ Kk5zFkeOCpK9EbQ3c9xPeFR8I03fqR2VqxGtSbA5oVqPebtyCXLU3QBcdicZ+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b commit d93c8a4d5a3fb47fc0d1d9bbd752df5128a2809b Author: Vladimir Kondratyev AuthorDate: 2021-12-03 15:12:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-22 19:34:36 +0000 LinuxKPI: Convert schedule() to inlined function to prevent name clashing with drm-kmod MFC after: 1 week Reviewed by: hselasky, manu Differential Revision: https://reviews.freebsd.org/D33294 (cherry picked from commit 7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d) --- sys/compat/linuxkpi/common/include/linux/sched.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 937e9f27870c..e99f58198fc5 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -161,8 +161,12 @@ linux_schedule_get_interrupt_value(struct task_struct *task) return (value); } -#define schedule() \ - (void)linux_schedule_timeout(MAX_SCHEDULE_TIMEOUT) +static inline void +schedule(void) +{ + (void)linux_schedule_timeout(MAX_SCHEDULE_TIMEOUT); +} + #define schedule_timeout(timeout) \ linux_schedule_timeout(timeout) #define schedule_timeout_killable(timeout) \