From nobody Thu Mar 31 18:22: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 101411A388E3; Thu, 31 Mar 2022 18:22: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 4KTs9M6y8Hz3KT2; Thu, 31 Mar 2022 18:22:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648750968; 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=VnSWQTn6WpM58NoPwwjqGAqWhShCcxKqZYK44yUZbmo=; b=Zr08l6dtDNPZg4d/ywazVaQf6dMh+5/cN68n5KE+9ZrWGuVz/L3r5p4ZcADf8E60yP3mDO yndCAXg59dbq4MHZnPLL4rIXMdnmav3LlVTCy1ck2YDGdENgn/fXVp+ccObQnauOVWA5nz kYUQiuF25YFwmYIQwsVWAdp7DjTe3fIKIAEtXuCvWasc5WDVAVdGSz/b7mzX67YricBPk3 Azw8rfNAvQgPcbuOOdUsxfhfHgRVNnSOwMtoXrUdWmUoEDlonrjVJZQzbpOw8kPtTIZkPP noNADgTUkFLXlv5LHCeZoytijrZ5Fa7FHqOIvbIuRDGZn6i/JOF3ywYAg8PreA== 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 C9BF82CB05; Thu, 31 Mar 2022 18:22: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 22VIMlwi084718; Thu, 31 Mar 2022 18:22:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22VIMlWp084717; Thu, 31 Mar 2022 18:22:47 GMT (envelope-from git) Date: Thu, 31 Mar 2022 18:22:47 GMT Message-Id: <202203311822.22VIMlWp084717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 4e1e83461bdc - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4e1e83461bdc9b8c3ab96dc82e7342d4ea1e69b9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648750968; 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=VnSWQTn6WpM58NoPwwjqGAqWhShCcxKqZYK44yUZbmo=; b=HASW0tRwldyr4dhWbEQe7vzB4DbyAOCdjSey7+lXbLyNMLWagm/rm55Y9b6ZUC/rERaZaB MwIVrhtB8NDQZsjXT1xL+oPSQzC2gPYYJEam8GQriYeHIowIbcLoj2ZuFO+7SUbwSS6HG8 pSggjWll+uGa6xDfsPF4+fc9N413L0YHaK/LG6DJ30q5oxd8qJBW8GhvTPmeiZiwaPg3Gz NENUJTBEk8KVEmK/deq+3SNqTiAPhAkAUdCCbFAncheK5oo71Uxxg1Ylr5dluvyPJkzdp+ Aiyog87SN8Lb70XmSOm1+xRfoRAMoar5F7BNIQhfdLsvMB0zGnQ9EsbjbHtzlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648750968; a=rsa-sha256; cv=none; b=ez9CvzXLd2b2crb5foAmzgsyboPmCnbJM2tl8fePb0CAGdtCdj+uOLYo15qko/VV76ZdYJ 3FEhHUx52mWU5v+aU3u0kD4RlujbzVhoEeUpq4Uifr+MqLU6d4eA2FG5ZlZi6ATfjqxfW1 W3xFFn/F8SlHassOQC/uqw1gbaNLM6eJUQiB32VZ++8O7wJSPz2U1sSv8lmKmkPfzBQ2pk mRQ919S7WhoCy2dtBwPW7F9zge6CO4WRX34Jj0+/35kBQEYykUIbOdUZDSF1S8Nfn8tjJN DmknsLPycwrGvAf9z5LhtOLhrHcrjnf4Z/0igm0L/1A7DmaReaH2XWHUwq9EqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4e1e83461bdc9b8c3ab96dc82e7342d4ea1e69b9 commit 4e1e83461bdc9b8c3ab96dc82e7342d4ea1e69b9 Author: Dmitry Chagin AuthorDate: 2022-03-31 18:22:31 +0000 Commit: Dmitry Chagin CommitDate: 2022-03-31 18:22:31 +0000 linux(4): Fix KASSERT message. MFC after: 2 weeks --- 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; }