From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 02:41:02 +0000 (+1000)
Subject: Merge remote-tracking branch 'slab/for-next'
X-Git-Tag: next-20120910~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0181b8b27ee2c4d65189a719cc6fd544555f5a47;p=karo-tx-linux.git

Merge remote-tracking branch 'slab/for-next'
---

0181b8b27ee2c4d65189a719cc6fd544555f5a47
diff --cc mm/slub.c
index 8f78e2577031,dafd465f7a3f..e5d935768476
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -3719,7 -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