diff options
author | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-09-26 21:06:46 -0400 |
commit | bf78296ab1cb215d0609ac6cff4e43e941e51265 (patch) | |
tree | a193615b327d9ee538e71ca5f13bbfb4f3db4e6b /kernel/pid.c | |
parent | 18eb2f6e19d77900695987e3a2b775cccbe5b84e (diff) | |
parent | 6bf4ca7fbc85d80446ac01c0d1d77db4d91a6d84 (diff) |
BackMerge v4.19-rc5 into drm-next
Sean Paul requested an -rc5 backmerge from some sun4i fixes.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'kernel/pid.c')
-rw-r--r-- | kernel/pid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index de1cfc4f75a2..cdf63e53a014 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -195,7 +195,7 @@ struct pid *alloc_pid(struct pid_namespace *ns) | |||
195 | idr_preload_end(); | 195 | idr_preload_end(); |
196 | 196 | ||
197 | if (nr < 0) { | 197 | if (nr < 0) { |
198 | retval = nr; | 198 | retval = (nr == -ENOSPC) ? -EAGAIN : nr; |
199 | goto out_free; | 199 | goto out_free; |
200 | } | 200 | } |
201 | 201 | ||