From owner-p4-projects@FreeBSD.ORG  Wed Dec  5 05:34:06 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1DC4B16A46B; Wed,  5 Dec 2007 05:34:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B73FD16A421
	for <perforce@freebsd.org>; Wed,  5 Dec 2007 05:34:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A316E13C46A
	for <perforce@freebsd.org>; Wed,  5 Dec 2007 05:34:05 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB55Y594028982
	for <perforce@freebsd.org>; Wed, 5 Dec 2007 05:34:05 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB55Y5wg028979
	for perforce@freebsd.org; Wed, 5 Dec 2007 05:34:05 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 5 Dec 2007 05:34:05 GMT
Message-Id: <200712050534.lB55Y5wg028979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 130242 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 05 Dec 2007 05:34:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=130242

Change 130242 by kmacy@entropy_kmacy_xen31 on 2007/12/05 05:33:47

	fix conflict with xen support code's definition of test_and_clear_bit

Affected files ...

.. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#3 edit
.. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#2 edit

Differences ...

==== //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#3 (text+ko) ====

@@ -179,7 +179,7 @@
 
 #define t3_os_sleep(x) DELAY((x) * 1000)
 
-#define test_and_clear_bit(bit, p) atomic_cmpset_int((p), ((*(p)) | bit), ((*(p)) & ~bit)) 
+#define TEST_AND_CLEAR_BIT(bit, p) atomic_cmpset_int((p), ((*(p)) | bit), ((*(p)) & ~bit)) 
 
 
 #define max_t(type, a, b) (type)max((a), (b))

==== //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#2 (text+ko) ====

@@ -1410,7 +1410,7 @@
 		smp_mb();
 
 		if (should_restart_tx(q) &&
-		    test_and_clear_bit(qid, &qs->txq_stopped))
+		    TEST_AND_CLEAR_BIT(qid, &qs->txq_stopped))
 			return 2;
 
 		q->stops++;
@@ -1529,7 +1529,7 @@
 		smp_mb();
 
 		if (should_restart_tx(q) &&
-		    test_and_clear_bit(TXQ_CTRL, &qs->txq_stopped))
+		    TEST_AND_CLEAR_BIT(TXQ_CTRL, &qs->txq_stopped))
 			goto again;
 		q->stops++;
 	}
@@ -1917,7 +1917,7 @@
 			smp_mb();
 
 			if (should_restart_tx(q) &&
-			    test_and_clear_bit(TXQ_OFLD, &qs->txq_stopped))
+			    TEST_AND_CLEAR_BIT(TXQ_OFLD, &qs->txq_stopped))
 				goto again;
 			q->stops++;
 			break;
@@ -2043,13 +2043,13 @@
 	
 	if (isset(&qs->txq_stopped, TXQ_OFLD) &&
 	    should_restart_tx(&qs->txq[TXQ_OFLD]) &&
-	    test_and_clear_bit(TXQ_OFLD, &qs->txq_stopped)) {
+	    TEST_AND_CLEAR_BIT(TXQ_OFLD, &qs->txq_stopped)) {
 		qs->txq[TXQ_OFLD].restarts++;
 		taskqueue_enqueue(sc->tq, &qs->txq[TXQ_OFLD].qresume_task);
 	}
 	if (isset(&qs->txq_stopped, TXQ_CTRL) &&
 	    should_restart_tx(&qs->txq[TXQ_CTRL]) &&
-	    test_and_clear_bit(TXQ_CTRL, &qs->txq_stopped)) {
+	    TEST_AND_CLEAR_BIT(TXQ_CTRL, &qs->txq_stopped)) {
 		qs->txq[TXQ_CTRL].restarts++;
 		taskqueue_enqueue(sc->tq, &qs->txq[TXQ_CTRL].qresume_task);
 	}