From 3b4d943d6798cb10f76c5277e8b0f37bad44e791 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sat, 8 Sep 2012 18:27:10 +0000 Subject: [PATCH] --- yaml --- r: 330446 b: refs/heads/master c: 9df53b154ac712c87db1170057aa6df05eb7bdbd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/slub.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20e1ef88b068..ddb4f96d475e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aac3a1664aba429f47c70edfc76ee10fcd808471 +refs/heads/master: 9df53b154ac712c87db1170057aa6df05eb7bdbd diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index dafd465f7a3f..2258ed82880a 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -3707,7 +3707,7 @@ void __init kmem_cache_init(void) /* Allocate two kmem_caches from the page allocator */ kmalloc_size = ALIGN(kmem_size, cache_line_size()); order = get_order(2 * kmalloc_size); - kmem_cache = (void *)__get_free_pages(GFP_NOWAIT, order); + kmem_cache = (void *)__get_free_pages(GFP_NOWAIT | __GFP_ZERO, order); /* * Must first have the slab cache available for the allocations of the