diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /drivers/misc/cxl/context.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
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, | |||
| 90 | */ | 90 | */ |
| 91 | mutex_lock(&afu->contexts_lock); | 91 | mutex_lock(&afu->contexts_lock); |
| 92 | idr_preload(GFP_KERNEL); | 92 | idr_preload(GFP_KERNEL); |
| 93 | i = idr_alloc(&ctx->afu->contexts_idr, ctx, | 93 | i = idr_alloc(&ctx->afu->contexts_idr, ctx, ctx->afu->adapter->min_pe, |
| 94 | ctx->afu->adapter->native->sl_ops->min_pe, | ||
| 95 | ctx->afu->num_procs, GFP_NOWAIT); | 94 | ctx->afu->num_procs, GFP_NOWAIT); |
| 96 | idr_preload_end(); | 95 | idr_preload_end(); |
| 97 | mutex_unlock(&afu->contexts_lock); | 96 | mutex_unlock(&afu->contexts_lock); |