|
@@ -1021,7 +1021,7 @@ static void sdma_complete(void *cookie, int status)
|
|
struct ipath_verbs_txreq *tx = cookie;
|
|
struct ipath_verbs_txreq *tx = cookie;
|
|
struct ipath_qp *qp = tx->qp;
|
|
struct ipath_qp *qp = tx->qp;
|
|
struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
|
|
struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
|
|
- unsigned int flags;
|
|
|
|
|
|
+ unsigned long flags;
|
|
enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?
|
|
enum ib_wc_status ibs = status == IPATH_SDMA_TXREQ_S_OK ?
|
|
IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;
|
|
IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR;
|
|
|
|
|
|
@@ -1051,7 +1051,7 @@ static void sdma_complete(void *cookie, int status)
|
|
|
|
|
|
static void decrement_dma_busy(struct ipath_qp *qp)
|
|
static void decrement_dma_busy(struct ipath_qp *qp)
|
|
{
|
|
{
|
|
- unsigned int flags;
|
|
|
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
if (atomic_dec_and_test(&qp->s_dma_busy)) {
|
|
if (atomic_dec_and_test(&qp->s_dma_busy)) {
|
|
spin_lock_irqsave(&qp->s_lock, flags);
|
|
spin_lock_irqsave(&qp->s_lock, flags);
|
|
@@ -1221,7 +1221,7 @@ static int ipath_verbs_send_pio(struct ipath_qp *qp,
|
|
unsigned flush_wc;
|
|
unsigned flush_wc;
|
|
u32 control;
|
|
u32 control;
|
|
int ret;
|
|
int ret;
|
|
- unsigned int flags;
|
|
|
|
|
|
+ unsigned long flags;
|
|
|
|
|
|
piobuf = ipath_getpiobuf(dd, plen, NULL);
|
|
piobuf = ipath_getpiobuf(dd, plen, NULL);
|
|
if (unlikely(piobuf == NULL)) {
|
|
if (unlikely(piobuf == NULL)) {
|