diff options
| author | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-03 18:03:47 +0200 |
| commit | 12456e509be25d24fe479394852428517922d02a (patch) | |
| tree | 8b1e8e1025ce1beb350bbf977ac8b8ffdd5fbfa1 /drivers/gpu/drm/ttm/ttm_memory.c | |
| parent | Merge tag 'usb-serial-5.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | Linux 5.1-rc7 (diff) | |
| download | kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.gz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.tar.xz kernel-qcow2-linux-12456e509be25d24fe479394852428517922d02a.zip | |
Merge 5.1-rc7 into usb-next
We need this to make the usb-gadget branch merge cleaner. And for
testing to keep from hitting the same issues already fixed.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_memory.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_memory.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index f1567c353b54..9a0909decb36 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c @@ -461,8 +461,8 @@ out_no_zone: void ttm_mem_global_release(struct ttm_mem_global *glob) { - unsigned int i; struct ttm_mem_zone *zone; + unsigned int i; /* let the page allocator first stop the shrink work. */ ttm_page_alloc_fini(); @@ -475,9 +475,10 @@ void ttm_mem_global_release(struct ttm_mem_global *glob) zone = glob->zones[i]; kobject_del(&zone->kobj); kobject_put(&zone->kobj); - } + } kobject_del(&glob->kobj); kobject_put(&glob->kobj); + memset(glob, 0, sizeof(*glob)); } static void ttm_check_swapping(struct ttm_mem_global *glob) |