diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-07 11:14:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-07 11:14:43 +0100 |
| commit | 9320831dc88c215d47d1095c06253ac38d41f29d (patch) | |
| tree | 9ea6ad6aad2b12cc58c2bcfd86092b7ce372ebea /mm | |
| parent | 4fa7c16a310c6abbf6873659655c3e9fb1bdc4ce (diff) | |
| parent | bffa1e42b3713aa7911cc3f9a6e5a2dbbf1dc789 (diff) | |
Merge tag 'v4.4.146' into linux-linaro-lsk-v4.4
This is the 4.4.146 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/slub.c | 2 | ||||
| -rw-r--r-- | mm/vmalloc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index d6fe997c0577..490825fd931a 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -689,7 +689,7 @@ void object_err(struct kmem_cache *s, struct page *page, print_trailer(s, page, object); } -static void slab_err(struct kmem_cache *s, struct page *page, +static __printf(3, 4) void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...) { va_list args; diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 8e3c9c5a3042..de8e372ece04 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -1460,7 +1460,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); @@ -1470,6 +1470,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; |