The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=bf20896da4545067eec2e6d8203a57fcdcee52cf
commit bf20896da4545067eec2e6d8203a57fcdcee52cf
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2024-02-05 23:39:31 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2024-02-05 23:39:31 +0000
i386: Use bool for booleans in getmemsize
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D43716
---
sys/i386/i386/machdep.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index ac675bd0dd42..008d67017f68 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1130,10 +1130,11 @@ physmap_done:
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 tmp;
+ bool full, page_bad;
- full = FALSE;
+ full = false;
/*
* block out kernel memory as not available.
*/
@@ -1148,7 +1149,7 @@ physmap_done:
&& pa < dcons_addr + dcons_size)
goto do_dump_avail;
- page_bad = FALSE;
+ page_bad = false;
if (memtest == 0)
goto skip_memtest;
@@ -1163,25 +1164,25 @@ physmap_done:
*/
*(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.
*/
@@ -1191,7 +1192,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
@@ -1212,7 +1213,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 */
