diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-23 07:18:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-23 07:18:09 +0100 |
| commit | 064e6a8ba61a751625478f656c6f76a6f37a009e (patch) | |
| tree | a22d84d037543f74b6c86969c7e87ab799768de9 /drivers/gpu/drm/msm/msm_gem_shrinker.c | |
| parent | af25ed59b5616b389d90877f7085dc5d457a3d49 (diff) | |
| parent | 23400ac997062647f2b63c82030d189671b1effe (diff) | |
| download | linux-064e6a8ba61a751625478f656c6f76a6f37a009e.tar.bz2 | |
Merge branch 'linus' into x86/fpu, to resolve conflicts
Conflicts:
arch/x86/kernel/fpu/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_gem_shrinker.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem_shrinker.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c index 283d2841ba58..192b2d3a79cb 100644 --- a/drivers/gpu/drm/msm/msm_gem_shrinker.c +++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c @@ -163,6 +163,9 @@ void msm_gem_shrinker_init(struct drm_device *dev) void msm_gem_shrinker_cleanup(struct drm_device *dev) { struct msm_drm_private *priv = dev->dev_private; - WARN_ON(unregister_vmap_purge_notifier(&priv->vmap_notifier)); - unregister_shrinker(&priv->shrinker); + + if (priv->shrinker.nr_deferred) { + WARN_ON(unregister_vmap_purge_notifier(&priv->vmap_notifier)); + unregister_shrinker(&priv->shrinker); + } } |