diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
| commit | 1aaaa9acaea1dd2878d6c92b45e4c117ef425baf (patch) | |
| tree | f1fe5948a6da8850862ae751da0b62dac351517f /drivers/misc/cxl/context.c | |
| parent | 73577d61799e8d8bb7d69a9acdc54923e5998138 (diff) | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
Merge 4.8-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/cxl/context.c')
| -rw-r--r-- | drivers/misc/cxl/context.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c index bdee9a01ef35..c466ee2b0c97 100644 --- a/drivers/misc/cxl/context.c +++ b/drivers/misc/cxl/context.c @@ -90,8 +90,7 @@ int cxl_context_init(struct cxl_context *ctx, struct cxl_afu *afu, bool master, */ mutex_lock(&afu->contexts_lock); idr_preload(GFP_KERNEL); - i = idr_alloc(&ctx->afu->contexts_idr, ctx, - ctx->afu->adapter->native->sl_ops->min_pe, + i = idr_alloc(&ctx->afu->contexts_idr, ctx, ctx->afu->adapter->min_pe, ctx->afu->num_procs, GFP_NOWAIT); idr_preload_end(); mutex_unlock(&afu->contexts_lock); |