Merge tag 'drm-for-v4.15' of git://people.freedesktop.org/~airlied/linux

[sfrench/cifs-2.6.git] / drivers / gpu / drm / nouveau / include / nvkm / core / client.h

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/client.h b/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
index ca23230d574377bfde2926c20ef3d6381e4b3101..757fac823a10fa9f0de9c4962829bab818044615 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/core/client.h
@@ -17,7 +17,8 @@ struct nvkm_client {
        void *data;
        int (*ntfy)(const void *, u32, const void *, u32);
 
-       struct nvkm_vm *vm;
+       struct list_head umem;
+       spinlock_t lock;
 };
 
 int  nvkm_client_new(const char *name, u64 device, const char *cfg,