From nobody Mon Nov 20 01:40:19 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 4SYVZC67Gyz51gSd; Mon, 20 Nov 2023 01:40:19 +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 4SYVZC5PQnz4D3d; Mon, 20 Nov 2023 01:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444419; 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=2B6s/TCE2tiuO1MZTvQkF1fgCZ4ypzQ8FJPMC10il58=; b=kngW9H4VaJ8iezQ6yD1Z+yOxKzxTIJBznW5WDP1Sonmy95iGVePUlPtcMrkR7bB1EhRtP+ eU3UnJrSxeE3xKzDl5jcyGChjh34MLFQXrUbI+jjFQe6PTYSP6i+VKwMUZfUpDj6Nln2ck 78BpkSoTK/UFLngGIEHBAIxlfIY8jTJNtxY2uP7hYP+mUFk9Q0KBLNbQOVahgKugDzhYyB U15pzcGBg+4wOHGwjUbQLq/FYPP1K0PtR15xhXavMM+i+oKEwszV4JL3Pvg0Rb/KMAKxU1 8cpT8JHZH07w9QTc7fZnUyme/nkhksyCv/SF1Y5LfH3y2t2Y3xL+noOH2LJ8PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444419; 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=2B6s/TCE2tiuO1MZTvQkF1fgCZ4ypzQ8FJPMC10il58=; b=XFjL+hgDM1EeSvesEeAql0Z8i30AhYuYLne3PMX93oJ1UHZXII0WvLaNTAROyRQoML027V VKhZ5bYEWxfxyl4W619qKt85odsVwfER9oV494heabjiNJmcYURlDz2mYYMwSpCb1PEvlR LqU7pzMlTSP5qwwngXcXtERIBPOHEbMHydhDsGIgUO7tnYOWedKvFgUmOytchZPM+LGT7E 83E9ZIpL59qV5bi91H4csDMEU9sLUIpfZz/u6Sx9krN/6gcRTggpQNRl4AxO2hBdkVyCNR jRqIyzznrHqYAfPKiHzKUXmDxcO1RN1GXbSSNZ3fpAZvBIdYAkmRxxP9eAcw/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700444419; a=rsa-sha256; cv=none; b=nCNwfwsVPVA85PBVO3yi/WgngKwyiIcJDTrTniMxdgqBcRSNSy0jWdczGG/C4VstdHMKS3 c3AYOEtZUWIy6ZvhMSY7cDl4u4eXernoINeWW9bgtaVJes4iowOw3lIwjAHDrxLT7RuS/2 p8kuZZhujgv3PzvJJnaybnr2DuOq5FA+Bg9nwoQKqGCDLX6F2vb7AhHh1cELzgPFCUX9Gy nEcdE7pJjZcrliV47dtbz7OsE/CTedOu2gFRHnEOqdU6BWMVYWVV3FFGjF+Buj/SF5/diQ /k1C2agpW/rbZugWdjrV2NDs82OqIb3kR7ghH8kcIlp7H1si2RsGtQH58/6jcQ== 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 4SYVZC4Rk1zY5x; Mon, 20 Nov 2023 01:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AK1eJJK044299; Mon, 20 Nov 2023 01:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK1eJao044296; Mon, 20 Nov 2023 01:40:19 GMT (envelope-from git) Date: Mon, 20 Nov 2023 01:40:19 GMT Message-Id: <202311200140.3AK1eJao044296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 071364c85081 - stable/14 - reboot(8): adapt for vmmeter v_swappgsin expansion to 64bit 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 071364c85081981b22bbf8651fb5307a543e9de9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=071364c85081981b22bbf8651fb5307a543e9de9 commit 071364c85081981b22bbf8651fb5307a543e9de9 Author: Konstantin Belousov AuthorDate: 2023-11-13 01:30:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 01:39:21 +0000 reboot(8): adapt for vmmeter v_swappgsin expansion to 64bit PR: 275048 (cherry picked from commit 194cc45a81f70aa280546b7a5e658028df0303e7) --- sbin/reboot/reboot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 6f656fd5f88c..bcb6c6bde05a 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -60,7 +60,7 @@ static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #include static void usage(void) __dead2; -static u_int get_pageins(void); +static uint64_t get_pageins(void); static int dohalt; @@ -70,7 +70,7 @@ main(int argc, char *argv[]) struct utmpx utx; const struct passwd *pw; int ch, howto, i, fd, lflag, nflag, qflag, sverrno, Nflag; - u_int pageins; + uint64_t pageins; const char *user, *kernel = NULL; if (strstr(getprogname(), "halt") != NULL) { @@ -272,10 +272,10 @@ usage(void) exit(1); } -static u_int +static uint64_t get_pageins(void) { - u_int pageins; + uint64_t pageins; size_t len; len = sizeof(pageins); @@ -284,5 +284,5 @@ get_pageins(void) warnx("v_swappgsin"); return (0); } - return pageins; + return (pageins); }