From nobody Fri Jun 17 19:38:56 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 586D385BB3D; Fri, 17 Jun 2022 19:38:57 +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 4LPq9D74wHz3QlF; Fri, 17 Jun 2022 19:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494737; 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=Ivpaskt+GyuC8piE8Fj0NoNYU5cXdSu5NgVr381G390=; b=uVqaXxyuhwbh23wvKnPBa6t9aIc7MRim9jrFovvAtwa3mmZAJ5jA00njZhbVIR9NThKqT0 0eRomaK9i2+kAKmUvmGA19sDOo48NndV1k84oJ7V7n0WLAXWddMES019j7JKVEMVH7p2Xg wV7vhH/kKeUesiRYpVzYtLlZvNNXYMbo+fkExWO9N58hZIg6EsQoR9x22f8y/XZndx4IUX 5i8yKs3lgBjTmO6NWqCCzbMxNTxthYebz2sTd5wrauxMqsfagwD/BhUXCuG3NzFXrT9knP /X/1KPb0I0TwXTLrqMqNxH/XHaErGJw+XyOAFzT0SOucAx93+vVntz4J/Xj1iA== 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 D39C125AD0; Fri, 17 Jun 2022 19:38:56 +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 25HJcubi015355; Fri, 17 Jun 2022 19:38:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJcuCE015354; Fri, 17 Jun 2022 19:38:56 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:56 GMT Message-Id: <202206171938.25HJcuCE015354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: c4ca1d2a2742 - stable/13 - linux(4): Fix KASSERT message. 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4ca1d2a27425050b4fce747bad04852c1bcb398 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494737; 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=Ivpaskt+GyuC8piE8Fj0NoNYU5cXdSu5NgVr381G390=; b=lRqaGgx6HPKYI2JlOLBZaeqEdIUJGrg6L/lPomy9gGYXqX/7y0/BrU6ew3LiednTeRQl73 zEZY/koVVErPdg5glmiLG4xTJD1iNnTRLJif10GEzD7gF6lNmovnTVR6QPxSe1tbuIjbTv FeU++u/U8B7QsSw/YoShfoaQNRAIwfwsii0sxc/6GEQ8ASeZsjPAsvHe9STTk8gs8Z2H/K 0guUQhHPkNVHHU4oZhAGXs/5CwOk3Okw4a2Q92KiUkYp7cpmc46Omnw/b2uw4Vk08ddKA9 FCJ2JWCPXPDvOSZfyB1tK+AaJxrKQ/qC0dmpySHIHgMJjGAqEPcBlGZ5tQ4SbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494737; a=rsa-sha256; cv=none; b=md89waJP8g5uyA/eS0plZyug2IAFKKVW5PYC6TouSJWED6JnHIBqUWgugQCQb+0Pb7ceWa IU9EFAIsVwoeLVTw0w/6qQXfJ6I0kq4Fj+IZ85ADq0MANYAiy7ff7rnKo7kOamRSgbIJyD spG00MpFINIIoYDoTtBk+tMIPMKekho+qlnuCNJ+XeQXvsygyJ+k9Q2MqUfR0oMGW19kcJ n8fyCN8SY/KsM+6VwkKo7Hobiq5WdhrjjvSjNDLsVca8RnHzUoxn167a2kXIR5abWaqxm0 Js8DhaGgvMwtJmdA/5PMl9CvvSHShW0eRbio7iwijqCBFSppE1aY9jV1P8n8Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c4ca1d2a27425050b4fce747bad04852c1bcb398 commit c4ca1d2a27425050b4fce747bad04852c1bcb398 Author: Dmitry Chagin AuthorDate: 2022-03-31 18:22:31 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:48 +0000 linux(4): Fix KASSERT message. MFC after: 2 weeks (cherry picked from commit 4e1e83461bdc9b8c3ab96dc82e7342d4ea1e69b9) --- sys/compat/linux/linux_emul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 12e078546ac6..1e8da643bb9a 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -176,7 +176,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) /* lookup the old one */ em = em_find(td); - KASSERT(em != NULL, ("proc_init: emuldata not found in exec case.\n")); + KASSERT(em != NULL, ("proc_init: thread emuldata not found.\n")); em->em_tid = p->p_pid; em->flags = 0; @@ -185,7 +185,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) em->child_set_tid = NULL; pem = pem_find(p); - KASSERT(pem != NULL, ("proc_exit: proc emuldata not found.\n")); + KASSERT(pem != NULL, ("proc_init: proc emuldata not found.\n")); pem->persona = 0; pem->oom_score_adj = 0; }