projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm/master'
[deliverable/linux.git]
/
drivers
/
infiniband
/
sw
/
rdmavt
/
cq.c
diff --git
a/drivers/infiniband/sw/rdmavt/cq.c
b/drivers/infiniband/sw/rdmavt/cq.c
index f2f229efbe64d7d8ddcdf4f985ad23be76ec6977..6d9904a4a0abe7efb9e882942cd76f96dc920806 100644
(file)
--- a/
drivers/infiniband/sw/rdmavt/cq.c
+++ b/
drivers/infiniband/sw/rdmavt/cq.c
@@
-129,7
+129,7
@@
void rvt_cq_enter(struct rvt_cq *cq, struct ib_wc *entry, bool solicited)
if (likely(worker)) {
cq->notify = RVT_CQ_NONE;
cq->triggered++;
if (likely(worker)) {
cq->notify = RVT_CQ_NONE;
cq->triggered++;
-
queue_kthread
_work(worker, &cq->comptask);
+
kthread_queue
_work(worker, &cq->comptask);
}
}
}
}
@@
-265,7
+265,7
@@
struct ib_cq *rvt_create_cq(struct ib_device *ibdev,
cq->ibcq.cqe = entries;
cq->notify = RVT_CQ_NONE;
spin_lock_init(&cq->lock);
cq->ibcq.cqe = entries;
cq->notify = RVT_CQ_NONE;
spin_lock_init(&cq->lock);
-
init_kthread
_work(&cq->comptask, send_complete);
+
kthread_init
_work(&cq->comptask, send_complete);
cq->queue = wc;
ret = &cq->ibcq;
cq->queue = wc;
ret = &cq->ibcq;
@@
-295,7
+295,7
@@
int rvt_destroy_cq(struct ib_cq *ibcq)
struct rvt_cq *cq = ibcq_to_rvtcq(ibcq);
struct rvt_dev_info *rdi = cq->rdi;
struct rvt_cq *cq = ibcq_to_rvtcq(ibcq);
struct rvt_dev_info *rdi = cq->rdi;
-
flush_kthread
_work(&cq->comptask);
+
kthread_flush
_work(&cq->comptask);
spin_lock(&rdi->n_cqs_lock);
rdi->n_cqs_allocated--;
spin_unlock(&rdi->n_cqs_lock);
spin_lock(&rdi->n_cqs_lock);
rdi->n_cqs_allocated--;
spin_unlock(&rdi->n_cqs_lock);
@@
-514,7
+514,7
@@
int rvt_driver_cq_init(struct rvt_dev_info *rdi)
rdi->worker = kzalloc(sizeof(*rdi->worker), GFP_KERNEL);
if (!rdi->worker)
return -ENOMEM;
rdi->worker = kzalloc(sizeof(*rdi->worker), GFP_KERNEL);
if (!rdi->worker)
return -ENOMEM;
-
init_kthread
_worker(rdi->worker);
+
kthread_init
_worker(rdi->worker);
task = kthread_create_on_node(
kthread_worker_fn,
rdi->worker,
task = kthread_create_on_node(
kthread_worker_fn,
rdi->worker,
@@
-547,7
+547,7
@@
void rvt_cq_exit(struct rvt_dev_info *rdi)
/* blocks future queuing from send_complete() */
rdi->worker = NULL;
smp_wmb(); /* See rdi_cq_enter */
/* blocks future queuing from send_complete() */
rdi->worker = NULL;
smp_wmb(); /* See rdi_cq_enter */
-
flush_kthread
_worker(worker);
+
kthread_flush
_worker(worker);
kthread_stop(worker->task);
kfree(worker);
}
kthread_stop(worker->task);
kfree(worker);
}
This page took
0.026862 seconds
and
5
git commands to generate.