diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-14 08:35:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-14 08:35:08 -0700 |
| commit | 2d6cc4c81b1cb69379102c57a9a927c9583ccb8b (patch) | |
| tree | b90d9b7048091bcc0d63096f6b7595e14e54d5e4 /mm/vmalloc.c | |
| parent | 601ae48764031462cfd3b2f62b2d712a3447978b (diff) | |
| parent | b2c952f9a899b7ec78c417951a950f08c5aa9e3a (diff) | |
Merge "Merge android-4.4.146 (13962260) into msm-4.4"
Diffstat (limited to 'mm/vmalloc.c')
| -rw-r--r-- | mm/vmalloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 32e83c8bd087..c3c28beaae11 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1535,7 +1535,7 @@ static void __vunmap(const void *addr, int deallocate_pages) addr)) return; - area = remove_vm_area(addr); + area = find_vmap_area((unsigned long)addr)->vm; if (unlikely(!area)) { WARN(1, KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", addr); @@ -1545,6 +1545,7 @@ static void __vunmap(const void *addr, int deallocate_pages) debug_check_no_locks_freed(addr, get_vm_area_size(area)); debug_check_no_obj_freed(addr, get_vm_area_size(area)); + remove_vm_area(addr); if (deallocate_pages) { int i; |