git: dbbff47e274c - main - Retire bogus predicts on case statements.

The branch main has been updated by mjg:

URL: https://cgit.FreeBSD.org/src/commit/?id=dbbff47e274c16d56c6adf42fecbb33157718287

commit dbbff47e274c16d56c6adf42fecbb33157718287
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2026-10-20 05:24:13 +0000
Commit:     Mateusz Guzik <mjg@FreeBSD.org>
CommitDate: 2026-10-20 05:24:13 +0000

    Retire bogus predicts on case statements.
    
    They are ignored by clang.
    
    No functional changes (nor .o changes).
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/dev/gve/gve_tx_dqo.c         | 2 +-
 sys/dev/random/random_harvestq.c | 2 +-
 sys/kern/kern_malloc.c           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/dev/gve/gve_tx_dqo.c b/sys/dev/gve/gve_tx_dqo.c
index 551a7e308d19..0561092105fa 100644
--- a/sys/dev/gve/gve_tx_dqo.c
+++ b/sys/dev/gve/gve_tx_dqo.c
@@ -437,7 +437,7 @@ gve_map_mbuf_dqo(struct gve_tx_ring *tx,
 	    *mbuf, segs, nsegs, BUS_DMA_NOWAIT);
 
 	switch (err) {
-	case __predict_true(0):
+	case 0:
 		break;
 	case EFBIG:
 		if (__predict_false(attempt > 0))
diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c
index 296721d2c4e9..3d3588937cf3 100644
--- a/sys/dev/random/random_harvestq.c
+++ b/sys/dev/random/random_harvestq.c
@@ -443,7 +443,7 @@ random_harvest_healthtest(const struct harvest_event *event)
 	}
 
 	switch (ht->ht_state) {
-	case __predict_false(INIT):
+	case INIT:
 		/* Store the first sample and initialize test state. */
 		random_healthtest_rct_init(ht, event);
 		random_healthtest_apt_init(ht, event);
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index ffc260781d60..d2dd7ec5acee 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -916,7 +916,7 @@ _free(void *addr, struct malloc_type *mtp, bool dozero)
 		    dozero, addr, (void *)((uintptr_t)addr & (~UMA_SLAB_MASK)));
 
 	switch (GET_SLAB_COOKIE(slab)) {
-	case __predict_true(SLAB_COOKIE_SLAB_PTR):
+	case SLAB_COOKIE_SLAB_PTR:
 		size = zone->uz_size;
 #if defined(INVARIANTS) && !defined(KASAN)
 		free_save_type(addr, mtp, size);
@@ -1014,7 +1014,7 @@ realloc(void *addr, size_t size, struct malloc_type *mtp, int flags)
 
 	/* Get the size of the original block */
 	switch (GET_SLAB_COOKIE(slab)) {
-	case __predict_true(SLAB_COOKIE_SLAB_PTR):
+	case SLAB_COOKIE_SLAB_PTR:
 		alloc = zone->uz_size;
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE:
@@ -1109,7 +1109,7 @@ malloc_usable_size(const void *addr)
 		    addr, (void *)((u_long)addr & (~UMA_SLAB_MASK)));
 
 	switch (GET_SLAB_COOKIE(slab)) {
-	case __predict_true(SLAB_COOKIE_SLAB_PTR):
+	case SLAB_COOKIE_SLAB_PTR:
 		size = zone->uz_size;
 		break;
 	case SLAB_COOKIE_MALLOC_LARGE: