diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-11-27 13:41:11 +0100 |
| commit | 3fb42daaf11c4be8e0626b733916f3a7b65bcfae (patch) | |
| tree | d40ab1904047d2db03c9f6e9b538e01d62415646 /mm/vmalloc.c | |
| parent | efdbe3c3edb6c8c98a8be863f60916780a5375c1 (diff) | |
| parent | 06a691e64b11323a735db3c3bd909d3c0712698f (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index d04563480c94..8e3c9c5a3042 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1443,7 +1443,6 @@ struct vm_struct *remove_vm_area(const void *addr) vmap_debug_free_range(va->va_start, va->va_end); kasan_free_shadow(vm); free_unmap_vmap_area(va); - vm->size -= PAGE_SIZE; return vm; } @@ -1468,8 +1467,8 @@ static void __vunmap(const void *addr, int deallocate_pages) return; } - debug_check_no_locks_freed(addr, area->size); - debug_check_no_obj_freed(addr, area->size); + debug_check_no_locks_freed(addr, get_vm_area_size(area)); + debug_check_no_obj_freed(addr, get_vm_area_size(area)); if (deallocate_pages) { int i; |