From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Apr 2008 21:08:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg... 
X-Git-Tag: v2.6.26-rc1~695
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e97e386b126c2d60b8da61ce1e4964b41b3d1514;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: pack objects denser
  slub: Calculate min_objects based on number of processors.
  slub: Drop DEFAULT_MAX_ORDER / DEFAULT_MIN_OBJECTS
  slub: Simplify any_slab_object checks
  slub: Make the order configurable for each slab cache
  slub: Drop fallback to page allocator method
  slub: Fallback to minimal order during slab page allocation
  slub: Update statistics handling for variable order slabs
  slub: Add kmem_cache_order_objects struct
  slub: for_each_object must be passed the number of objects in a slab
  slub: Store max number of objects in the page struct.
  slub: Dump list of objects not freed on kmem_cache_close()
  slub: free_list() cleanup
  slub: improve kmem_cache_destroy() error message
  slob: fix bug - when slob allocates "struct kmem_cache", it does not force alignment.
---

e97e386b126c2d60b8da61ce1e4964b41b3d1514
diff --cc mm/slub.c
index 38914bc64ac,d821ce6fff3..992ecd4f0d3
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -204,9 -185,12 +185,7 @@@ static inline void ClearSlabDebug(struc
  /* Internal SLUB flags */
  #define __OBJECT_POISON		0x80000000 /* Poison object */
  #define __SYSFS_ADD_DEFERRED	0x40000000 /* Not yet visible via sysfs */
- #define __KMALLOC_CACHE		0x20000000 /* objects freed using kfree */
- #define __PAGE_ALLOC_FALLBACK	0x10000000 /* Allow fallback to page alloc */
  
 -/* Not all arches define cache_line_size */
 -#ifndef cache_line_size
 -#define cache_line_size()	L1_CACHE_BYTES
 -#endif
 -
  static int kmem_size = sizeof(struct kmem_cache);
  
  #ifdef CONFIG_SMP