From nobody Sat Nov 30 16:51:29 2024 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 4Y0x021tZcz5fJ1F; Sat, 30 Nov 2024 16:51:30 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0x015NRwz4nmZ; Sat, 30 Nov 2024 16:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985489; 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=apFOMleb49ufpC0ltR9AP08k1VhuVNV2bbnnUN3boG0=; b=KLN7gz/5uEVi8318TGejcvK/eQnx4+pZaS70qBeDZ6hW63XZhUhPfJ2Q1QvRuFyAedWyex IEm5+hbvMOkwmi5UjsFlDeQX4D1KGpRABtjnmAoXlEab1js3knTNOr01MZTyvMO0vJ9+rx Fzl2P4IgXfcV7XgT5Va8U+TPxNCaBQOKolxw3rOtvTZBo1GUiI6KzFtqzFP5jpXPJKMg8v JavWqc+5FkYab/GQck0pP3A7Q1lZgc5XvuIqsoc3LOx756rZowtqBkxVfOwoPrCSM8LFZU R0DaJonLA+XH19x1I0o1nPMIKi7oVfVGFXwtlqaK2oQDveM3KlCrIBBDN13tHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985489; 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=apFOMleb49ufpC0ltR9AP08k1VhuVNV2bbnnUN3boG0=; b=M7jP894/0iNM9fSjWES85ufZVH5YzATCUICs+T6rliME8qo9Q1b7V4W9N8wxod4Z3/7fTH 9LI9/qZ7dg2xIVcrKqIfpnpNPyGhdGDyIoBUKAflex/JhCBNIBorHCMs0Pgw4js8ufVtSw YBGflLSnlFL8uozT9KFtCWiswMqWck1tsn0J4LcvGSGcKKj8xGZBeiZ5a89jWB4yX2aZ3H PNorP4FgdJYd1AKnvqZVqox+H2tW4MOK2BZ2KfbYw/Fxectih0ywUWM+1oE75/tF6lcHxO mAyCUyQyXeX4rXKdWcptd6bUGKfTJexfedM0KxcPLHdnfxr2htbUtQct5YkseQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732985489; a=rsa-sha256; cv=none; b=JoARVbPyIFpKrzcEyqnnqjz8rRwHnqqpB+uhsFtUVV7hFX7EGv4D+rZDtQ68xj4M/ldfZj JjzHaEXnOjKLuBLNLyLRSbcf0Mh/QLJ//8wIjpbzhUGLfz58VSTMVxuEGZVl82ORo5Tmx2 TRTmxoJ/Lk2WXjqKuo0DzcgSdcUxsaeloiRnZ6kqtqx6Ic7esUOD1R4UVnEDBFEV8oZ6rx a0BqFqOrkc7E4wptIPwaAZF2JbnbU+TFrjXDQJD9k7XwOgF4AFDtbSaCk+UymRTBz3c5Gx BNSSwJWgJe1/KPyWCEdoM6qW8ct9LSS7kGJPapFZS5USJGIZ/5rfUFMRysKtFw== 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 4Y0x015040zGhS; Sat, 30 Nov 2024 16:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUGpTkP046858; Sat, 30 Nov 2024 16:51:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUGpTF8046855; Sat, 30 Nov 2024 16:51:29 GMT (envelope-from git) Date: Sat, 30 Nov 2024 16:51:29 GMT Message-Id: <202411301651.4AUGpTF8046855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 19eed0321ccf - stable/13 - i386: Use bool for booleans in getmemsize 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19eed0321ccf17cdbc9cd1c5b75466ef27a2db34 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=19eed0321ccf17cdbc9cd1c5b75466ef27a2db34 commit 19eed0321ccf17cdbc9cd1c5b75466ef27a2db34 Author: John Baldwin AuthorDate: 2024-02-05 23:39:31 +0000 Commit: John Baldwin 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 */