diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-28 12:01:09 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-28 12:01:09 +0800 |
| commit | 6e49b7fa3083c30688b7fff1b37ed891cd1c30af (patch) | |
| tree | 3054864f2e58bcd86000567ce99e25753ddc794a /drivers/gpu/drm/drm_modeset_lock.c | |
| parent | 2ba51c6d36ee1b43c1f898c6c48ddf3d33e9ab30 (diff) | |
| parent | be42cd02846a611af533103a3f4b6a7d8c592f49 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.03-rt
Diffstat (limited to 'drivers/gpu/drm/drm_modeset_lock.c')
| -rw-r--r-- | drivers/gpu/drm/drm_modeset_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c index 61146f5b4f56..0a6bf815640e 100644 --- a/drivers/gpu/drm/drm_modeset_lock.c +++ b/drivers/gpu/drm/drm_modeset_lock.c @@ -81,7 +81,7 @@ void drm_modeset_lock_all(struct drm_device *dev) struct drm_modeset_acquire_ctx *ctx; int ret; - ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); + ctx = kzalloc(sizeof(*ctx), GFP_KERNEL | __GFP_NOFAIL); if (WARN_ON(!ctx)) return; |