From nobody Mon Nov 13 01:48:23 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 4STC4l6Ny5z51Fq5; Mon, 13 Nov 2023 01:48:23 +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 4STC4l5tjKz3RZY; Mon, 13 Nov 2023 01:48:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699840103; 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=iYw8TTF/RaoUMStmOJ0HwCqk+g3n6cFT2Di7WA+WXxw=; b=lxqgva4b8sBWmXFQLjBlfiPwLyJ6RosdWbnj+LrBEMn5NFMSJVq/Ly/NzGH3h73oSmEI+7 vgTMPym46Plauyeg/Ao6OOfJx2EfNNwqnQbRnQZN1NnK1MVmdTq+HS2XjDf6/ZqA4TRZuA UHTciUbYRLUqODHpKOVkM14atIp5JOMd4QxlngXwQIWgi7P3DWJv1z7/9o7g3YUkX6uCzb +jhJAuRaFo5s7kKDim/tl67vQNKYsK9U+0LgktjYhEU9UH9YZDuQO+6k7x60j7uCCLISIX C8lu5LCgrGr7B7BQRNXO8XG4GinPI5vsW/WtrmZgRnJM4d4ziMDWx6azZ9gMKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699840103; 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=iYw8TTF/RaoUMStmOJ0HwCqk+g3n6cFT2Di7WA+WXxw=; b=DubWzLZSALgsr7vRNnXuY3TzrxEQCPuqBMJ23dg3vEdb7cPofWfJ0G3OEPbvLwV7ZlR1dw CJOZ4w5T3eh1/iI4V5YnJGe94F0Kkjh9vMsH3f2+5harUqnuCFyUY7qJluqRJoSevNU0JC vbYrF/Xmps/hAsmSPj90BiRdzNBIfKjUod5c7vJidTq75IQjb63PL7f8a/VH5+bY5HwkqQ lR/86YN/MO2aBCyiZ6RLiFG+hhCbDa/4UNbIBBO84Qq1Id/ffeO08I2uGJNS34aHOpq7lK XpygIhtKYe8YrPW+3gn6+MRCTA8Egmb5GUyQ2UFgdVVhU6TwIsWdPR4mkDLUTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699840103; a=rsa-sha256; cv=none; b=m+r63pXbZoCLaL6A2te6jcye46TToHcdaL2r14lJ1CoJPThIQQIgXzBMdm9gBT4Q49a9Tv tD/yfYSfIMD/1CyYrT0xNn5ZtL0aBWDlejwz9jz6brElPda9wYeD0VYvk1xWAa7XqsKB17 nLraLPtaiQCkR4IW+fB+ZMuYQMXAskhPzq/gBQAnWinRC1pJtdjdreT4f9BTxAhrNz1OMR kIjEhklBhlSgR9QrfFUdvY9H/ZsKV9Xjtj5PFnqSkMX4kNdpbGWTYJ3GtmTx6jOYpIRufv 8A0Pm+AYg8xhxQLd2lNqUo42tOuwZ1ps5CklLDVvDWyJ+69aRIqJ8lDt9igZ1Q== 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 4STC4l507qzms8; Mon, 13 Nov 2023 01:48:23 +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 3AD1mNb2091292; Mon, 13 Nov 2023 01:48:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AD1mNnQ091289; Mon, 13 Nov 2023 01:48:23 GMT (envelope-from git) Date: Mon, 13 Nov 2023 01:48:23 GMT Message-Id: <202311130148.3AD1mNnQ091289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 194cc45a81f7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 194cc45a81f70aa280546b7a5e658028df0303e7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=194cc45a81f70aa280546b7a5e658028df0303e7 commit 194cc45a81f70aa280546b7a5e658028df0303e7 Author: Konstantin Belousov AuthorDate: 2023-11-13 01:30:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-11-13 01:46:36 +0000 reboot(8): adapt for vmmeter v_swappgsin expansion to 64bit Otherwise reboot(8) requires COMPAT_FREEBSD11 kernel config option. PR: 275048 Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42561 --- 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); }