The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5048308bdb76f40e88c9133658fc61d82158ded2
commit 5048308bdb76f40e88c9133658fc61d82158ded2
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2024-07-29 10:28:15 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2024-08-19 09:04:24 +0000
buf_ring: Remove PREFETCH_DEFINED
I'm not able to find anything in the tree that ever defined it. Remove
as it's unused so is untested.
Reviewed by: alc, imp, kib, markj
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D46148
---
sys/sys/buf_ring.h | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h
index cb18175c3a75..6bd3b91dcd04 100644
--- a/sys/sys/buf_ring.h
+++ b/sys/sys/buf_ring.h
@@ -165,9 +165,6 @@ static __inline void *
buf_ring_dequeue_sc(struct buf_ring *br)
{
uint32_t cons_head, cons_next;
-#ifdef PREFETCH_DEFINED
- uint32_t cons_next_next;
-#endif
uint32_t prod_tail;
void *buf;
@@ -204,20 +201,10 @@ buf_ring_dequeue_sc(struct buf_ring *br)
prod_tail = atomic_load_acq_32(&br->br_prod_tail);
cons_next = (cons_head + 1) & br->br_cons_mask;
-#ifdef PREFETCH_DEFINED
- cons_next_next = (cons_head + 2) & br->br_cons_mask;
-#endif
if (cons_head == prod_tail)
return (NULL);
-#ifdef PREFETCH_DEFINED
- if (cons_next != prod_tail) {
- prefetch(br->br_ring[cons_next]);
- if (cons_next_next != prod_tail)
- prefetch(br->br_ring[cons_next_next]);
- }
-#endif
br->br_cons_head = cons_next;
buf = br->br_ring[cons_head];
