git: 19eed0321ccf - stable/13 - i386: Use bool for booleans in getmemsize
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Nov 2024 16:51:29 UTC
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=19eed0321ccf17cdbc9cd1c5b75466ef27a2db34
commit 19eed0321ccf17cdbc9cd1c5b75466ef27a2db34
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-02-05 23:39:31 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-11-29 19:12:04 +0000
i386: Use bool for booleans in getmemsize
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D43716
(cherry picked from commit bf20896da4545067eec2e6d8203a57fcdcee52cf)
---
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 4b9afd7d85ca..99039f2271fb 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -1139,10 +1139,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.
*/
@@ -1157,7 +1158,7 @@ physmap_done:
&& pa < dcons_addr + dcons_size)
goto do_dump_avail;
- page_bad = FALSE;
+ page_bad = false;
if (memtest == 0)
goto skip_memtest;
@@ -1172,25 +1173,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.
*/
@@ -1200,7 +1201,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
@@ -1221,7 +1222,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 */