From nobody Sat Nov 30 16:51:02 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 4Y0wzW55r5z5fHxY; Sat, 30 Nov 2024 16:51:03 +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 4Y0wzW0nBpz4nJs; Sat, 30 Nov 2024 16:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985463; 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=FHt4KXHen6DTTG3hPir6yAlq3fVjuPjTRGPvc10vEQM=; b=Ce4BIuh+KXnB6CTyK+wQ9RQnagKpMNBuBmRDmMRz+6je5p6UjagRiDYIkeC1qhzsDDD0xu /2Q45EnIG3DUkLsNPn2tCti6cH7Ltd5X8CvFFDUrApNIhDoHAWupUC9ZkfBkA7kJANRvhV w5tw6ETT/k+FHTRYGqUH5QPNDL81C7oWATkdHQnncEMhtrsFHdZn4IOHv1v0U5axm86ZqS BRHfroTnjXaKzDjz5iet3hljO7jBsgwMx1od6Ty+fhQMbN4qNIqJr9kAY4uoe8hhOoqQeF cnvfN2SAnevfz0xzkAB1NVEkVjE5AsAcarxSEdbL8XKR36eDMfoEmOPaCotm6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985463; 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=FHt4KXHen6DTTG3hPir6yAlq3fVjuPjTRGPvc10vEQM=; b=AQmeAt/OpGLd7lCzBXn6A3ue+w7Dzl/UZxu9qUrXpaDGNy3MB3RfO/TmbFfiTFSVf0pgL8 dwuxA+gmGxz3hRnCboZMRUnZyU0xGqiYzuxL19PCUHMh1AGlBLuVRwfoOc/dfe6C9/pWgA TPdO16HVMHL1I4wePa/kGcvdLBv9pZ2XPqUzGLm0rTThClckmOTj9PKYHaCasWk6LYxUq6 A9Hu/BLsB/YAoWiU5LX7BvBxGV3BvDVvoj89RcCB45SDh6YBqflFgfsZo/Km6bd3vQA4VQ v6HH5hGLKPQDGo0piGG6McHCHmAghIAR8QUrC3d7d/oRSWw1m0WFv7hzXxrxuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732985463; a=rsa-sha256; cv=none; b=snvQ2FBMs716qDvUKIx/3umRdlLlnWNbFQ8xp52h6vCemne1hGX8wM9fNMfi0EszfePEer YhOV/u1Jrvrv/ukl+AizUN0iuGj18uPXZ0MfrjWHq+m6r2YzkA3atkGX5EEn3Hk3J20LN7 zumavmYCBGCcS30I7WZP2QlL36kzvKSJ8s6fnSpQAtrHTDEmoJ+VmzUMFfFM8KaQcLmbGr KosoHkqjImgQyQbUgiCeHnT8VzwMSLYwi0Qd0OqpbKTqkQQdbHEzAG2mM28RKCPyWIirCN BoT0dpie/74iZpj9PJXS1c+8it1ThGKKwmeKvVj8YX6mbtMi58w4pNiMJKSXqg== 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 4Y0wzW0NWDzGKq; Sat, 30 Nov 2024 16:51:03 +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 4AUGp2gu043041; Sat, 30 Nov 2024 16:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUGp2Yv043038; Sat, 30 Nov 2024 16:51:02 GMT (envelope-from git) Date: Sat, 30 Nov 2024 16:51:02 GMT Message-Id: <202411301651.4AUGp2Yv043038@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: 35d8944bfcd9 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 35d8944bfcd9a3812f80393c2e77f3e9bf98a27d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=35d8944bfcd9a3812f80393c2e77f3e9bf98a27d commit 35d8944bfcd9a3812f80393c2e77f3e9bf98a27d Author: John Baldwin AuthorDate: 2024-02-05 23:39:31 +0000 Commit: John Baldwin CommitDate: 2024-11-30 13:55:56 +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 adc571f00a3f..21a49b06ce60 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1132,10 +1132,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. */ @@ -1150,7 +1151,7 @@ physmap_done: && pa < dcons_addr + dcons_size) goto do_dump_avail; - page_bad = FALSE; + page_bad = false; if (memtest == 0) goto skip_memtest; @@ -1165,25 +1166,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. */ @@ -1193,7 +1194,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 @@ -1214,7 +1215,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 */