Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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
Linus Torvalds 14 years ago
parent
a28e0852d4 1ab335d8f8
commit
bc584c5107
2 changed files with 3 additions and 3 deletions
Unified View Show Diff Stats
  1. 1 1
      include/linux/slub_def.h
  2. 2 2
      mm/slab.c

+ 1 - 1
include/linux/slub_def.h
View File 

@@ -68,7 +68,7 @@ struct kmem_cache_order_objects {
 
  * Slab cache management.
 
  * Slab cache management.
 
  */
 
  */
 
 struct kmem_cache {
 
 struct kmem_cache {
 
-	struct kmem_cache_cpu *cpu_slab;
 
+	struct kmem_cache_cpu __percpu *cpu_slab;
 
 	/* Used for retriving partial slabs etc */
 
 	/* Used for retriving partial slabs etc */
 
 	unsigned long flags;
 
 	unsigned long flags;
 
 	int size;		/* The size of an object including meta data */
 
 	int size;		/* The size of an object including meta data */

+ 2 - 2
mm/slab.c
View File 

@@ -2330,8 +2330,8 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 
 	}
 
 	}
 
 #if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
 
 #if FORCED_DEBUG && defined(CONFIG_DEBUG_PAGEALLOC)
 
 	if (size >= malloc_sizes[INDEX_L3 + 1].cs_size
 
 	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;
 
 		size = PAGE_SIZE;
 
 	}
 
 	}
 
 #endif
 
 #endif