Commit bc584c51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  slab: fix object alignment
  slub: add missing __percpu markup in mm/slub_def.h
parents a28e0852 1ab335d8

include/linux/slub_def.h

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct kmem_cache_order_objects { 
 * Slab cache management.

 */

struct kmem_cache {

	struct kmem_cache_cpu *cpu_slab;

	struct kmem_cache_cpu __percpu *cpu_slab;

	/* Used for retriving partial slabs etc */

	unsigned long flags;

	int size;		/* The size of an object including meta data */

mm/slab.c

+2 −2
Original line number Diff line number Diff line
@@ -2330,8 +2330,8 @@ kmem_cache_create (const char *name, size_t size, size_t align, 
	}

#if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)

	if (size >= malloc_sizes[INDEX_L3 + 1].cs_size

	    && cachep->obj_size > cache_line_size() && size < PAGE_SIZE) {

		cachep->obj_offset += PAGE_SIZE - size;

	    && cachep->obj_size > cache_line_size() && ALIGN(size, align) < PAGE_SIZE) {

		cachep->obj_offset += PAGE_SIZE - ALIGN(size, align);

		size = PAGE_SIZE;

	}

#endif