From nobody Tue Jan 24 22:10:21 2023 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 4P1h3x52hBz3bf3M; Tue, 24 Jan 2023 22:10:21 +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 4P1h3x3q7Yz4Jxn; Tue, 24 Jan 2023 22:10:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598221; 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=CDSoiyqHmzWUk5t4E7OCbm7LUmhtN5mInsQSC0BloYw=; b=NtNqzeyXO4FB4+1F8owmY2bbmm5QE6lWhQUD3+o9c0Q3TESgFr5hg773aIm3jYDgq647a7 xvXow1k3jNIJ/qNgz+9bth5oquVwAkRkdaOWXGu5IxBLQAyzxDaTwYwFmiidxPFv8H6P4G KUARqeWz7hDkdPAtCv2WCrZtWFMfwcz6foczpDsI5fY9szUcZ9laOFlIDwSMktiDIQrESO 4JeointhAN+N/fb6O9daty39iEsfc+UEvw34slbGc/a+FDx6NkSrnDdK1uqUKCeRXkGvke llsmSCpUKXLfqW7wvc+0TXKHQ3j0jdrp9VUNKVW3nlRLznjs5Xj4X3vZTUJ2tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598221; 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=CDSoiyqHmzWUk5t4E7OCbm7LUmhtN5mInsQSC0BloYw=; b=k9mge9IWFiy1sdADAZJpYSsbgmDB9pQr2ubLhimwl/ckOMD4IjUic/Z806PO9iLI3T3+3W sXQ28T/yECsEC+ZAE+XzVi/jvl6wQRAarFP5YWPlNKFtIaIznwluOlStnFWa1O6f8WZISv Qw2NTJ9e7tVgND0QUWorvTcp3ZBnQQ/KUK3AOV+jFsrC7xRSGHs6ZLWtrJB4Ai1GHoA8oc zgIix6MOHZ2P8dqmIuS7axMHHKeux26FGuZ4VRG68uzgdYFTE9w3n8zkBXsGHx10B+SFi9 RKv/b1N2OOv/dX0KfpFv4yeVXhZkdsECJ3pkzPKHmpywrW4Va8EAZ8cZBg66Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598221; a=rsa-sha256; cv=none; b=maqCunryRhmMkUC3khsRZuYwOW9bQ9V3rOUyQo8unTdyLZdNu/WfsoGY1k+iiGbact+2Sk OFhs7U2vGOVFdyByRDiUIDiNcKOyZD7LlCa/I1eq7piZaFNRo+nHC0PvBGNubBGeWoQGWS 3AhRVV73wfKCDd1ejiLm4KcyLTse0m9OgcgHALxcDVD6P7R5TI90kGUr785fKBLZegRDzl m25OCMrNN/HCGbm/BuMrjfDMGFS/fjas7U1M5sBLOJBVvxmqZSmsauB+kzAED9348Kuh0F K1JF+7HC7nSzyX7GLVGxHCzDlPooMEtRMceSAgwieZKWeY9rdXqoDvHTz7HudA== 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 4P1h3x2x7MzQQv; Tue, 24 Jan 2023 22:10:21 +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 30OMALDC079931; Tue, 24 Jan 2023 22:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMALqD079930; Tue, 24 Jan 2023 22:10:21 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:21 GMT Message-Id: <202301242210.30OMALqD079930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6a930269fc76 - stable/13 - Handle MODULE_VERBOSE_TWIDDLE in module_verbose_set 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a930269fc7667c931bafe889807c003f182dd73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a930269fc7667c931bafe889807c003f182dd73 commit 6a930269fc7667c931bafe889807c003f182dd73 Author: Simon J. Gerraty AuthorDate: 2022-02-24 05:26:41 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 Handle MODULE_VERBOSE_TWIDDLE in module_verbose_set If module_verbose is set to a value below MODULE_VERBOSE_TWIDDLE call twiddle_divisor(UINT_MAX). This makes more sense here than when we are loading the kernel. Sponsored by: Juniper Networks, Inc. (cherry picked from commit e6925175174b1a7d7b5aef035ec684b2d5f628b9) --- stand/common/console.c | 5 +++++ stand/common/load_elf.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/common/console.c b/stand/common/console.c index 08d0dc40e3a9..0e8afb477ee8 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include @@ -58,6 +59,10 @@ module_verbose_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } module_verbose = (int)v; + if (module_verbose < MODULE_VERBOSE_TWIDDLE) { + /* A hack for now; we do not want twiddling */ + twiddle_divisor(UINT_MAX); + } env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); return (CMD_OK); diff --git a/stand/common/load_elf.c b/stand/common/load_elf.c index 99ebace012ea..363da4756c1d 100644 --- a/stand/common/load_elf.c +++ b/stand/common/load_elf.c @@ -469,11 +469,6 @@ __elfN(loadfile_raw)(char *filename, uint64_t dest, } else if (module_verbose > MODULE_VERBOSE_SILENT) printf("%s ", filename); - if (module_verbose < MODULE_VERBOSE_TWIDDLE) { - /* A hack for now; we do not want twiddling */ - twiddle_divisor(UINT_MAX); - } - fp->f_size = __elfN(loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) goto ioerr;