]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slab/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:41:02 +0000 (12:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 02:51:05 +0000 (12:51 +1000)
1  2 
mm/slub.c

diff --cc mm/slub.c
index 8f78e25770317e63a37c741d66c2761f71afa2e9,dafd465f7a3f32b4e28a9d95ec7d0aec15878b61..e5d9357684761df85968529bc0d6f128635e5366
+++ 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