From nobody Tue May 17 12:11:33 2022 X-Original-To: dev-commits-src-main@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 D09C11AEE3BD; Tue, 17 May 2022 12:11:33 +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 4L2ZjK4XC9z3Pfy; Tue, 17 May 2022 12:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652789493; 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=bsg0YqwQQH8Xrj9ezgYTBIDON3wDwIjnUPpojheb1kY=; b=vB1oZs+yIjjlVEL7P88znoQCDC8VCSxpxL/v2ywcJ/5zFEcYmv/qCoRSDXG84bZHoWDeU/ jWtWUBjAp2o87yP8E5decSKN+gbb8bBoN122xSkbMO+IOX0WkjpQ4/ssOEBb5UzjQvzI9N Bt3iFuC4M8gVMKLE+X2QQh0j92+8wW0CxdJMMG4Wc/DCYlLmNIHerOwDaifThMeRLJWUAO d8WBgeYQQ/R+EGbITx8+d2PmCYblltAHwzEdDKtB2YCxq5x6SpeUvP9hz6JkfdU04cpsRv qXJNBbpP9accGTV0GWaa98RNIdhJSZBRDvKSRJ85Eriak9v+fbFlZbwc1AWkWA== 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 5A1E91483D; Tue, 17 May 2022 12:11:33 +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 24HCBX1e093103; Tue, 17 May 2022 12:11:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HCBXg1093102; Tue, 17 May 2022 12:11:33 GMT (envelope-from git) Date: Tue, 17 May 2022 12:11:33 GMT Message-Id: <202205171211.24HCBXg1093102@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: 41559beb0005 - main - LinuxKPI: Fix typo in cond_resched_lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 41559beb000555770cff1e1b3ef0275157aeb608 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652789493; 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=bsg0YqwQQH8Xrj9ezgYTBIDON3wDwIjnUPpojheb1kY=; b=w95A8n/qtmNSi/pfN0WuKVF45E2aTythjniCxFOKvA5D/tS3E9Pfw4xU7H1YPNV5DsmGfN xzXwV/B6HbkjMJmrPh5eFBdR+iLnTAv1Qsuk1E/YMyZBUjvKHmgFcTWKPK0wkoYZEfz6N0 Q61N7iC+3RHzlWov/JacBkGcaHLM1FMNaY7o14Vh++awVnVsXFGwv3uI6re6l0DRAGZDsD jpEdkM9UAmHybcHjN/5euxrid3SMFjNzTVksLhryWU8bxFwa92h2L94Q5MNYWnnkD1A5R7 dboqNN0TWt+myykHE1ZT+Cf6vxiQMGji0hFeV8348IjnC0djQ6hUiu1XaWFtAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652789493; a=rsa-sha256; cv=none; b=GcqkNDXj4Dfa/MxrKE1DDVys8yViQIDUpaY0Qd2js1C/6s6A6Ee32ZqjI1jDo7FrKR2E2k ExpVaDBAndYolEgTFv1ZIfdQG3Zhj8u724/DWiU1znIox6FQUXMQBweISaS0n601o05844 8ysEVIMQlP/8dG9GWI3nIsZAljEkk+/UuQwtU2bcRVScMWuZ5fCGEOm4zNlHGZNyTaKfLN Ca71vUUQG9T79vpDOPjniXgsjlKQzGLKrvx5YRmtMMjGAtqfRvfliYEaiKlt3MZt0PchFe npcGcselM7VCLgmk8kAMADVd3X9NJOOKL+YAMlFj61KaGN51Hsk45QqgzJW/2g== 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=41559beb000555770cff1e1b3ef0275157aeb608 commit 41559beb000555770cff1e1b3ef0275157aeb608 Author: Vladimir Kondratyev AuthorDate: 2022-05-17 12:10:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-05-17 12:10:20 +0000 LinuxKPI: Fix typo in cond_resched_lock Lock must be released rather than acquired around mi_switch call. MFC after: 1 week Reviewed by: hselasky, manu Differential Revision: https://reviews.freebsd.org/D35048 --- sys/compat/linuxkpi/common/include/linux/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index aa4bdbc65c5b..1409df0a4b26 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -134,9 +134,9 @@ cond_resched_lock(spinlock_t *lock) if (need_resched() == 0) return (0); - spin_lock(lock); - cond_resched(); spin_unlock(lock); + cond_resched(); + spin_lock(lock); return (1); }