From nobody Wed Jun 01 21:51:47 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 8F9671B5C773; Wed, 1 Jun 2022 21:51:48 +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 4LD2sv6vskz4rPW; Wed, 1 Jun 2022 21:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654120308; 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=9OLyHP3pX404ELuAksCL/nO2QcdfXwZJw1nCk3EF1gc=; b=fC5Ar0eXumMxLffH3WanmeNmYCoMr8cnoxGZRLKHzJIkQ9sTDKdNp3WcOMbEjtNq/1T9K/ pc5HTQRoOVTPldM7ZyTSMdRSqBxUSs0Je2rzYUvpfH2Zt9SX88Ha1V0BgRL7hEkaJTZwUj PfYGvnjwVqTBE6f/Fk92zvFtRR88G+eKJe+/9ZPXQe6TLx49zeju7+t+XsS6CfMhPuEVlv ExqXVmVG9VseKSyk4US/EXB9kQnJ1VQnhdOM8tJEBEPEdi3+c9uxKaXUaoq7zKvfT1FrOT lNsx9UOqQ60CgMJ1o9UkQcPwK0zcLkGoaBge7p+bt3z8I9Wk4G3ajQK8GGFfUw== 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 BE54C68; Wed, 1 Jun 2022 21:51:47 +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 251Lpl11042777; Wed, 1 Jun 2022 21:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 251LplUH042776; Wed, 1 Jun 2022 21:51:47 GMT (envelope-from git) Date: Wed, 1 Jun 2022 21:51:47 GMT Message-Id: <202206012151.251LplUH042776@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: 99421af3d911 - stable/13 - LinuxKPI: Fix typo in cond_resched_lock 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 99421af3d9119d937f3481a8a71671592be6a355 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654120308; 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=9OLyHP3pX404ELuAksCL/nO2QcdfXwZJw1nCk3EF1gc=; b=HcNl8O08N8bHjMgTlXOnEVYosOxLByGdMwYB+9so3rp8zw3PCekW8hkS1CdtuFQmCNN62R RFSoBd/j9YOrpUh2pSAH1hH0UQUeW9+a2M1qMkhnfRXyUoWnzo1Mp4lnuSNINoWus7V4li CZ8nWyu2brzqBz2o6/3QPnMR4Rf5Q6T4CN6tk/PJO+3a/DNvZryTA4rLZ44qKm/JjPCXvE 5MqpoJWklhGoN+nT7mg0B5ZuWvzmTUj7HBUVAWckDdcLCtSDLgM8dSGug7CyANDnL9Dc8J sZ0iKlSTGZ6iQ9UHvvuQUaM4NwmcPqSaTc72K79DZWm1bw9c3o9YGS6P6pWJow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654120308; a=rsa-sha256; cv=none; b=dJySAdHAIYCMYwq6j3p2JpdspJUAll+YttQUyiWXvr1pUXmramjKap7d7W+opdzFOTMqjw WkLGca4eX9AfxnjIvbWi/nTC344aWqzffwXBwo38iOY1xtrBjagJ92nBQYDh0IZIvZIBdw 3lZQrLaza5MaSzWI9i9zuHk8hbMBHX7RxxfXz5+ghBqwk2IAFOmXkl+GAqrnviIKxBBM0F qs4SsjNsxQNLmA3XhAVBIo9Z7eilc+Mk5vqHUuWFJcFWrgdvE3nwmeqH9Pdr60IxxOE+Sw b88Kty5VcSO07aG0mOOeWm2+EH5I03SLpBDmrkdQj2DXknTVSsN7xHo36a4n1A== 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=99421af3d9119d937f3481a8a71671592be6a355 commit 99421af3d9119d937f3481a8a71671592be6a355 Author: Vladimir Kondratyev AuthorDate: 2022-05-17 12:10:20 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-06-01 21:50:13 +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 (cherry picked from commit 41559beb000555770cff1e1b3ef0275157aeb608) --- 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 4ad95446301f..8201cb743535 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -133,9 +133,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); }