summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-10-22 09:04:31 -0300
committerPekka Enberg <penberg@kernel.org>2012-10-31 08:53:54 +0200
commit8cf9864b1382851d90c7c505f8441c8928f1469e (patch)
tree0636c421980945c29706658d00d045f8089d486e /mm
parent242860a47a75b933a79a30f6a40bf4858f4a3ecc (diff)
downloadop-kernel-dev-8cf9864b1382851d90c7c505f8441c8928f1469e.zip
op-kernel-dev-8cf9864b1382851d90c7c505f8441c8928f1469e.tar.gz
mm/slob: Use free_page instead of put_page for page-size kmalloc allocations
When freeing objects, the slob allocator currently free empty pages calling __free_pages(). However, page-size kmallocs are disposed using put_page() instead. It makes no sense to call put_page() for kernel pages that are provided by the object allocator, so we shouldn't be doing this ourselves. This is based on: commit d9b7f22623b5fa9cc189581dcdfb2ac605933bf4 Author: Glauber Costa <glommer@parallels.com> slub: use free_page instead of put_page for freeing kmalloc allocation Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Matt Mackall <mpm@selenic.com> Acked-by: Glauber Costa <glommer@parallels.com> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/slob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/slob.c b/mm/slob.c
index fffbc82..e7d7901 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -500,7 +500,7 @@ void kfree(const void *block)
unsigned int *m = (unsigned int *)(block - align);
slob_free(m, *m + align);
} else
- put_page(sp);
+ __free_pages(sp, compound_order(sp));
}
EXPORT_SYMBOL(kfree);
OpenPOWER on IntegriCloud