diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 17:41:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-20 17:41:47 -0500 |
commit | 8b2e9b712f6139df9c754af0d67fecc4bbc88545 (patch) | |
tree | 4260126ffc11a2e60d92f3f9304bc2ea02516332 /init | |
parent | b5898cd057001336888b6aff601385b5f5e79b01 (diff) |
Revert "mm: create a separate slab for page->ptl allocation"
This reverts commit ea1e7ed33708c7a760419ff9ded0a6cb90586a50.
Al points out that while the commit *does* actually create a separate
slab for the page->ptl allocation, that slab is never actually used, and
the code continues to use kmalloc/kfree.
Damien Wyart points out that the original patch did have the conversion
to use kmem_cache_alloc/free, so it got lost somewhere on its way to me.
Revert the half-arsed attempt that didn't do anything. If we really do
want the special slab (remember: this is all relevant just for debug
builds, so it's not necessarily all that critical) we might as well redo
the patch fully.
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Kirill A Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 01573fdfa186..febc511e078a 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -476,7 +476,7 @@ static void __init mm_init(void) | |||
476 | mem_init(); | 476 | mem_init(); |
477 | kmem_cache_init(); | 477 | kmem_cache_init(); |
478 | percpu_init_late(); | 478 | percpu_init_late(); |
479 | pgtable_init(); | 479 | pgtable_cache_init(); |
480 | vmalloc_init(); | 480 | vmalloc_init(); |
481 | } | 481 | } |
482 | 482 | ||