diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-05-05 22:37:21 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-05-05 22:37:21 +0000 |
| commit | 4f047a5220f350f3354b98d6167b6bab2fcdebf9 (patch) | |
| tree | 0d535c5601da503851c140698998fb600bbf8fec /sys | |
| parent | 758e0b2531011be194ccc1998ebab0721ca1d3b5 (diff) | |
| download | FreeBSD-src-4f047a5220f350f3354b98d6167b6bab2fcdebf9.zip FreeBSD-src-4f047a5220f350f3354b98d6167b6bab2fcdebf9.tar.gz | |
conditionally define PANIC_IF, remove 'unlikely'
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/cxgb/cxgb_osdep.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h index 39bc33b..ecb1608 100644 --- a/sys/dev/cxgb/cxgb_osdep.h +++ b/sys/dev/cxgb/cxgb_osdep.h @@ -61,10 +61,12 @@ struct t3_mbuf_hdr { struct mbuf *mh_tail; }; +#ifndef PANIC_IF #define PANIC_IF(exp) do { \ if (exp) \ panic("BUG: %s", #exp); \ } while (0) +#endif #define m_get_priority(m) ((uintptr_t)(m)->m_pkthdr.rcvif) #define m_set_priority(m, pri) ((m)->m_pkthdr.rcvif = (struct ifnet *)((uintptr_t)pri)) @@ -132,9 +134,6 @@ void cxgb_log_tcb(struct adapter *sc, unsigned int tid); #define TX_START_MIN_DESC (TX_MAX_DESC << 2) - - - #define TX_START_MAX_DESC (TX_MAX_DESC << 3) /* maximum number of descriptors * call to start used per */ @@ -164,7 +163,7 @@ void prefetch(void *x) extern void kdb_backtrace(void); #define WARN_ON(condition) do { \ - if (unlikely((condition)!=0)) { \ + if (__predict_false((condition)!=0)) { \ log(LOG_WARNING, "BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \ kdb_backtrace(); \ } \ |
