git: 194cc45a81f7 - main - reboot(8): adapt for vmmeter v_swappgsin expansion to 64bit
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 13 Nov 2023 01:48:23 UTC
The branch main has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=194cc45a81f70aa280546b7a5e658028df0303e7
commit 194cc45a81f70aa280546b7a5e658028df0303e7
Author: Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2023-11-13 01:30:53 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
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 <utmpx.h>
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);
}