From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Nov 2013 16:10:34 +0000 (-0800)
Subject: Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v3.13-rc1~15
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=24f971abbda045c24d5d6f2438a7785567d2fde9

Merge branch 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux

Pull SLAB changes from Pekka Enberg:
 "The patches from Joonsoo Kim switch mm/slab.c to use 'struct page' for
  slab internals similar to mm/slub.c.  This reduces memory usage and
  improves performance:

    https://lkml.org/lkml/2013/10/16/155

  Rest of the changes are bug fixes from various people"

* 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (21 commits)
  mm, slub: fix the typo in mm/slub.c
  mm, slub: fix the typo in include/linux/slub_def.h
  slub: Handle NULL parameter in kmem_cache_flags
  slab: replace non-existing 'struct freelist *' with 'void *'
  slab: fix to calm down kmemleak warning
  slub: proper kmemleak tracking if CONFIG_SLUB_DEBUG disabled
  slab: rename slab_bufctl to slab_freelist
  slab: remove useless statement for checking pfmemalloc
  slab: use struct page for slab management
  slab: replace free and inuse in struct slab with newly introduced active
  slab: remove SLAB_LIMIT
  slab: remove kmem_bufctl_t
  slab: change the management method of free objects of the slab
  slab: use __GFP_COMP flag for allocating slab pages
  slab: use well-defined macro, virt_to_slab()
  slab: overloading the RCU head over the LRU for RCU free
  slab: remove cachep in struct slab_rcu
  slab: remove nodeid in struct slab
  slab: remove colouroff in struct slab
  slab: change return type of kmem_getpages() to struct page
  ...
---

24f971abbda045c24d5d6f2438a7785567d2fde9
diff --cc include/linux/mm_types.h
index 011eb85d7b0,95bf0c5a7eb..bd299418a93
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@@ -132,9 -135,9 +137,12 @@@ struct page 
  
  		struct list_head list;	/* slobs list of pages */
  		struct slab *slab_page; /* slab fields */
+ 		struct rcu_head rcu_head;	/* Used by SLAB
+ 						 * when destroying via RCU
+ 						 */
 +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && USE_SPLIT_PMD_PTLOCKS
 +		pgtable_t pmd_huge_pte; /* protected by page->ptl */
 +#endif
  	};
  
  	/* Remainder is not double word aligned */