arch/sh/kernel/dwarf.c: destroy mempools on cleanup
authorDavid Rientjes <rientjes@google.com>
Tue, 14 Apr 2015 22:42:37 +0000 (15:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:48:56 +0000 (16:48 -0700)
dwarf_reg_pool and dwarf_frame_pool are not properly destroyed when
cleaning up the dwarf unwinder.  Destroy them with mempool_destroy().

Also mark dwarf_unwinder_cleanup() as __init.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/sh/kernel/dwarf.c

index 67a049e75ec12f60cf7f1d1934d94122eb2f2617..60437e9c345eeba879fbaf17d10cd8c0e9cb9331 100644 (file)
@@ -993,7 +993,7 @@ static struct unwinder dwarf_unwinder = {
        .rating = 150,
 };
 
-static void dwarf_unwinder_cleanup(void)
+static void __init dwarf_unwinder_cleanup(void)
 {
        struct dwarf_fde *fde, *next_fde;
        struct dwarf_cie *cie, *next_cie;
@@ -1009,6 +1009,10 @@ static void dwarf_unwinder_cleanup(void)
        rbtree_postorder_for_each_entry_safe(cie, next_cie, &cie_root, node)
                kfree(cie);
 
+       if (dwarf_reg_pool)
+               mempool_destroy(dwarf_reg_pool);
+       if (dwarf_frame_pool)
+               mempool_destroy(dwarf_frame_pool);
        kmem_cache_destroy(dwarf_reg_cachep);
        kmem_cache_destroy(dwarf_frame_cachep);
 }