PERFORCE change 130242 for review

[Kip Macy]

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

Change 130242 by kmacy at 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);
 	}