diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-28 13:41:11 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-28 13:41:11 -0400 |
| commit | 1f6898212ad6415405ab589b602d6f60bb0d83ef (patch) | |
| tree | 2baf775a1128bcd0b15b1b4a9213df14597d32be /lib | |
| parent | 5b55c23934a2d5fb61cf0a82ade85042783308c9 (diff) | |
| parent | 2ffe8469f55805a0ce527bdf32ee85857dfad87a (diff) | |
Merge tag 'v3.12.27' into v3.12-rt
This is the 3.12.27 stable release
Conflicts:
arch/sparc/mm/init_64.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/btree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/btree.c b/lib/btree.c index f9a484676cb6..4264871ea1a0 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -198,6 +198,7 @@ EXPORT_SYMBOL_GPL(btree_init); void btree_destroy(struct btree_head *head) { + mempool_free(head->node, head->mempool); mempool_destroy(head->mempool); head->mempool = NULL; } |