From nobody Mon Nov 20 01:41:41 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 4SYVbn2nbMz51gQS; Mon, 20 Nov 2023 01:41:41 +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 4SYVbn2Kcwz4Fdk; Mon, 20 Nov 2023 01:41:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444501; 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=p0xzyfra3Tfi7roO8v2qt5Lsskj/0QNsz/jn9IWTmGg=; b=UrBlg+slKeCa3QOfdgLmAFXzDbFwPK+27Wvd6N0Yc99zv6uORdg7YikskgYLgpsEMvg8nd pbL/zodtjWDcThEvT2T+5SEPwcGs+sLxgiHPESJCYWDO3ZpXmPdmC0hQP61+t7TqFXs4hx hw2AKPxm7EJaiAiQsBHJRNwNV77+Kbd0hK7pCaJtyo4pG+g8oKEFr4idDNzgd5QTVO+1mb Lu2CaEY8HGbHX7GaR7pZ2m3F61IH/MAkSe7H2vlAH+YRI2yHnYIz9oFHQV7yYM/yKJsZD7 C45FPcmiU8UWdS5+Es4GmsgGlNwbEQSyz7lbUP+7Yw9xRl89lyADAN/0wqsHAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700444501; 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=p0xzyfra3Tfi7roO8v2qt5Lsskj/0QNsz/jn9IWTmGg=; b=ViMSuTeYd9K/MRo3Ga2m8M/wMazaGkOstJi5XjNA4qsnW2S4tZyfnL5Ru5AiwQqADAbers Q2hCzDMSk/tagkOiaygfjWRkgTpAI55tq0RDvKu+imlvR5NOTjbUg0Yhj+YUKQT4eHLnUb r3g2DFtNqkoxF3GKE0oRPZJf93lre6eeRALPLUUq2sT+7j++VaNukvyzEkLjQUNYKQrnk/ i4GnrmfB1cwx9CULJN98HYUowFDfzmA6tdiHpuI8qrfBD5pURVC+H+o5zkDd3G3RC0TFpc 5Pqnti/gyKX6ZXtMocFFNnjHEmsPfZ9LXXRmPt3XjQy2GcOm9tlOnbcpn9z3xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700444501; a=rsa-sha256; cv=none; b=ZM8jyfW65wjOfc8w35FtVdCf5NPYsINP7jxoWfN0PDksLvCGoL3TlIQVP2J6SrQRIA0Cnf iAbNm/VPOTXQmeOnnRx4IwVdkA5LuklRirpH8NB9Loc6JnJfvGtnvKszwTwLn08GH3/EGs zxcfvHgpUqkD9l+9+4FI6vzBnHi2rJOXjmujsuchaE7+y4W7CtzOczOjTt34LByjp5btf7 t7OJecrkO7LAixoyrVWjuZ7ki0bQdaIiohX7IGSQMnwGPiKjfgGPyiOFLPKJtI+Q4F82Nn 3mtdGBTq9FKl9PEXpj+eWMNjQu09fLbwwVBbURRjufVDf6jG8yzFsUX0eIM4Zg== 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 4SYVbn1QRBzYhY; Mon, 20 Nov 2023 01:41:41 +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 3AK1ffjh047382; Mon, 20 Nov 2023 01:41:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AK1ffll047378; Mon, 20 Nov 2023 01:41:41 GMT (envelope-from git) Date: Mon, 20 Nov 2023 01:41:41 GMT Message-Id: <202311200141.3AK1ffll047378@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: e6278ae2bd7c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: e6278ae2bd7c59d8057e1dfe8a801b1b46b392d4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e6278ae2bd7c59d8057e1dfe8a801b1b46b392d4 commit e6278ae2bd7c59d8057e1dfe8a801b1b46b392d4 Author: Konstantin Belousov AuthorDate: 2023-11-13 01:30:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-20 01:40:34 +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 9b9d956bea82..a087be7bbf23 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -58,7 +58,7 @@ static char sccsid[] = "@(#)reboot.c 8.1 (Berkeley) 6/5/93"; #include static void usage(void); -static u_int get_pageins(void); +static uint64_t get_pageins(void); static int dohalt; @@ -68,7 +68,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) { @@ -266,10 +266,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); @@ -278,5 +278,5 @@ get_pageins(void) warnx("v_swappgsin"); return (0); } - return pageins; + return (pageins); }