---

yaml --- r: 130792 b: refs/heads/master c: 3718909 h: refs/heads/master v: v3
git-mirror · Jan 28, 2009 · 18edd42 · 18edd42
1 parent d173870
commit 18edd42
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cf3eb2ff6b0844c678f2f48d0053b9d12b7da67
+refs/heads/master: 3718909448116bf4411445468c58acc946379f92
diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h
@@ -43,7 +43,10 @@ static inline void *kmalloc(size_t size, gfp_t flags)
 			i++;
 #include <linux/kmalloc_sizes.h>
 #undef CACHE
-		return NULL;
+		{
+			extern void __you_cannot_kmalloc_that_much(void);
+			__you_cannot_kmalloc_that_much();
+		}
 found:
 #ifdef CONFIG_ZONE_DMA
 		if (flags & GFP_DMA)
@@ -74,7 +77,10 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 			i++;
 #include <linux/kmalloc_sizes.h>
 #undef CACHE
-		return NULL;
+		{
+			extern void __you_cannot_kmalloc_that_much(void);
+			__you_cannot_kmalloc_that_much();
+		}
 found:
 #ifdef CONFIG_ZONE_DMA
 		if (flags & GFP_DMA)

diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
@@ -1996,7 +1996,7 @@ static struct kmem_cache_cpu *alloc_kmem_cache_cpu(struct kmem_cache *s,
 static void free_kmem_cache_cpu(struct kmem_cache_cpu *c, int cpu)
 {
 	if (c < per_cpu(kmem_cache_cpu, cpu) ||
-			c > per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) {
+			c >= per_cpu(kmem_cache_cpu, cpu) + NR_KMEM_CACHE_CPU) {
 		kfree(c);
 		return;
 	}