git: 5ced86e1e211 - stable/14 - amd64: Use bool for booleans in getmemsize
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 16:51:01 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=5ced86e1e211e09cb4da40081bc5698a52ff08f7
commit 5ced86e1e211e09cb4da40081bc5698a52ff08f7
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-02-02 22:58:46 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-11-30 13:55:56 +0000
amd64: Use bool for booleans in getmemsize
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D43693
(cherry picked from commit 70539d5da600a65d34c8d965ef2a9d475cbc9c4e)
---
sys/amd64/amd64/machdep.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 83a57ad3316f..ea0f164b2e56 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -984,10 +984,11 @@ getmemsize(caddr_t kmdp, u_int64_t first)
if (physmap[i + 1] < end)
end = trunc_page(physmap[i + 1]);
for (pa = round_page(physmap[i]); pa < end; pa += PAGE_SIZE) {
- int tmp, page_bad, full;
int *ptr = (int *)CADDR1;
+ int tmp;
+ bool full, page_bad;
- full = FALSE;
+ full = false;
/*
* block out kernel memory as not available.
*/
@@ -1002,7 +1003,7 @@ getmemsize(caddr_t kmdp, u_int64_t first)
&& pa < dcons_addr + dcons_size)
goto do_dump_avail;
- page_bad = FALSE;
+ page_bad = false;
if (memtest == 0)
goto skip_memtest;
@@ -1026,25 +1027,25 @@ getmemsize(caddr_t kmdp, u_int64_t first)
*/
*(volatile int *)ptr = 0xaaaaaaaa;
if (*(volatile int *)ptr != 0xaaaaaaaa)
- page_bad = TRUE;
+ page_bad = true;
/*
* Test for alternating 0's and 1's
*/
*(volatile int *)ptr = 0x55555555;
if (*(volatile int *)ptr != 0x55555555)
- page_bad = TRUE;
+ page_bad = true;
/*
* Test for all 1's
*/
*(volatile int *)ptr = 0xffffffff;
if (*(volatile int *)ptr != 0xffffffff)
- page_bad = TRUE;
+ page_bad = true;
/*
* Test for all 0's
*/
*(volatile int *)ptr = 0x0;
if (*(volatile int *)ptr != 0x0)
- page_bad = TRUE;
+ page_bad = true;
/*
* Restore original value.
*/
@@ -1054,7 +1055,7 @@ skip_memtest:
/*
* Adjust array of valid/good pages.
*/
- if (page_bad == TRUE)
+ if (page_bad == true)
continue;
/*
* If this good page is a continuation of the
@@ -1075,7 +1076,7 @@ skip_memtest:
printf(
"Too many holes in the physical address space, giving up\n");
pa_indx--;
- full = TRUE;
+ full = true;
goto do_dump_avail;
}
phys_avail[pa_indx++] = pa; /* start */