From nobody Mon Jan 10 19:50:38 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 E41C41954546; Mon, 10 Jan 2022 19:50:40 +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 4JXkvf4Bvjz3Ngr; Mon, 10 Jan 2022 19:50:38 +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 193B631EE; Mon, 10 Jan 2022 19:50:38 +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 20AJocsE008990; Mon, 10 Jan 2022 19:50:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20AJoceN008989; Mon, 10 Jan 2022 19:50:38 GMT (envelope-from git) Date: Mon, 10 Jan 2022 19:50:38 GMT Message-Id: <202201101950.20AJoceN008989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 7ec6cbf1d2fd - main - LinuxKPI: Convert schedule() to inlined 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641844239; 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=6NhSAXIDN8APCZt6gShSRQpsmYcOnOUMNx7fGgx3c+A=; b=ucbPNiGAiFhrpKJSXyCm8GCmFGMB+AcYOK9oW+2Qo/Xp8VYJpRFfsuAZhsQnaA6HBVCkz5 IwDB1qp0LDBpU0UVtAOCtukZ3AB9Sg/mr8ZZ2OBV1aMFITAykcpkPf/V0w1OgWkYeYNR92 be0WzJM1bhMVFGJcTRn8GYLQmgbdXew0DjUOouxJlPBoilBKtN9YNBYTcRB4L0K+EaSEWg QNcKgalzlyxHdSAL9VkVm7SI1CxdDHTAY+lNHKY2uANlzjgEQAmmbo/ILUv3eZOU2lE8Nk /KLEWJ5WwqpypWyYw83LmL5sGgirxDXzmuzoSuWwhXUcguAevDZBVfGE0zYPkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641844239; a=rsa-sha256; cv=none; b=kR5KXIGiIWY6W2mokfqCkVgSkZHepU3xhNjzitxzqF/212iKOBrwqDU2dP0+3YY7ujkFTy 8JmAs3djknilJexvAx+WzLtQ7L9yG3xXDHYVx5HnpDHZhylOh5JgW/ENSpp/AES9VQulC7 Es1uBe3ItIrk0hCfkUF2ti0UjKgFY2W01mvJ8GJA4JkdwA4oQns4AWvBRYQfHUCq1Ry3a1 d1u+AjnOLUwtxL5MH+4VTCKU9c8eK2vxSxTV0NV+Uxf9pH/zDphSrFAmKUUMszbh62MJuQ k2P41I7F1cNAQyJK6rpzk0x1gibhdyjgnaoaGQ0h3uXRxju4r1b/hfnfT8AfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d commit 7ec6cbf1d2fd104734ac8844d8c0bc1fdf50cb6d Author: Vladimir Kondratyev AuthorDate: 2021-12-03 15:12:50 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-01-10 19:49:37 +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 --- 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 5954b16f6496..8f9ce5526e2c 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -162,8 +162,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) \