From owner-dev-commits-src-branches@freebsd.org Fri Apr 9 05:08:46 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id B351C5CB58C;
Fri, 9 Apr 2021 05:08:46 +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 4FGmPV4cHXz3nvv;
Fri, 9 Apr 2021 05:08:46 +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 8F7B01810E;
Fri, 9 Apr 2021 05:08:46 +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 13958k28015869;
Fri, 9 Apr 2021 05:08:46 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13958kbp015868;
Fri, 9 Apr 2021 05:08:46 GMT (envelope-from git)
Date: Fri, 9 Apr 2021 05:08:46 GMT
Message-Id: <202104090508.13958kbp015868@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Konstantin Belousov <kib@FreeBSD.org>
Subject: git: e1fb4bc3e478 - stable/12 - Style
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: kib
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: e1fb4bc3e478b00cc4e89ef7609efafc0c87c3b4
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Apr 2021 05:08:46 -0000
The branch stable/12 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=e1fb4bc3e478b00cc4e89ef7609efafc0c87c3b4
commit e1fb4bc3e478b00cc4e89ef7609efafc0c87c3b4
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2021-04-04 16:27:42 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2021-04-09 04:57:31 +0000
Style
(cherry picked from commit 51a7be5f6036ebd47c8b3f704d52e7ec3f837114)
---
sys/vm/vm_kern.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
index 5f79482a2d3f..83d58a194f62 100644
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -848,7 +848,7 @@ debug_vm_lowmem(SYSCTL_HANDLER_ARGS)
i = 0;
error = sysctl_handle_int(oidp, &i, 0, req);
- if (error)
+ if (error != 0)
return (error);
if ((i & ~(VM_LOW_KMEM | VM_LOW_PAGES)) != 0)
return (EINVAL);
@@ -857,5 +857,6 @@ debug_vm_lowmem(SYSCTL_HANDLER_ARGS)
return (0);
}
-SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem, CTLTYPE_INT | CTLFLAG_RW, 0, 0,
- debug_vm_lowmem, "I", "set to trigger vm_lowmem event with given flags");
+SYSCTL_PROC(_debug, OID_AUTO, vm_lowmem,
+ CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RW, 0, 0, debug_vm_lowmem, "I",
+ "set to trigger vm_lowmem event with given flags");