diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-06-20 12:28:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-20 12:28:21 +0200 |
| commit | 902b31941327a0e9c0ca9eb7750414ae41bf8a89 (patch) | |
| tree | 300f4226c87e6df403cda861ab6766b23d278f09 /drivers/infiniband/sw/rxe/rxe_verbs.c | |
| parent | sched/fair: WARN() and refuse to set buddy when !se->on_rq (diff) | |
| parent | sched/wait: Disambiguate wq_entry->task_list and wq_head->task_list naming (diff) | |
| download | linux-dev-902b31941327a0e9c0ca9eb7750414ae41bf8a89.tar.xz linux-dev-902b31941327a0e9c0ca9eb7750414ae41bf8a89.zip | |
Merge branch 'WIP.sched/core' into sched/core
Conflicts:
kernel/sched/Makefile
Pick up the waitqueue related renames - it didn't get much feedback,
so it appears to be uncontroversial. Famous last words? ;-)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/sw/rxe/rxe_verbs.c')
| -rw-r--r-- | drivers/infiniband/sw/rxe/rxe_verbs.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_verbs.c b/drivers/infiniband/sw/rxe/rxe_verbs.c index 83d709e74dfb..073e66783f1d 100644 --- a/drivers/infiniband/sw/rxe/rxe_verbs.c +++ b/drivers/infiniband/sw/rxe/rxe_verbs.c @@ -740,13 +740,8 @@ static int init_send_wqe(struct rxe_qp *qp, struct ib_send_wr *ibwr, sge = ibwr->sg_list; for (i = 0; i < num_sge; i++, sge++) { - if (qp->is_user && copy_from_user(p, (__user void *) - (uintptr_t)sge->addr, sge->length)) - return -EFAULT; - - else if (!qp->is_user) - memcpy(p, (void *)(uintptr_t)sge->addr, - sge->length); + memcpy(p, (void *)(uintptr_t)sge->addr, + sge->length); p += sge->length; } |