Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 2 Sep 2024 08:50:49 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: be3d6ab9e147 - stable/14 - buf_ring: Remove PREFETCH_DEFINED
Message-ID:  <202409020850.4828on7K007408@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by andrew:

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

commit be3d6ab9e14790848e9331db27d48f92d6160bef
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-07-29 10:28:15 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-09-02 08:49:38 +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
    
    (cherry picked from commit 5048308bdb76f40e88c9133658fc61d82158ded2)
---
 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];
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409020850.4828on7K007408>