Commit 859281ff 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:
  slub: fix per cpu kmem_cache_cpu array memory leak
  kmalloc: return NULL instead of link failure
parents 93bfbd71 f58914e4

include/linux/slab_def.h

+2 −8
Original line number Diff line number Diff line
@@ -43,10 +43,7 @@ static inline void *kmalloc(size_t size, gfp_t flags) 
			i++;

#include <linux/kmalloc_sizes.h>

#undef CACHE

		{

			extern void __you_cannot_kmalloc_that_much(void);

			__you_cannot_kmalloc_that_much();

		}

		return NULL;

found:

#ifdef CONFIG_ZONE_DMA

		if (flags & GFP_DMA)
@@ -77,10 +74,7 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node) 
			i++;

#include <linux/kmalloc_sizes.h>

#undef CACHE

		{

			extern void __you_cannot_kmalloc_that_much(void);

			__you_cannot_kmalloc_that_much();

		}

		return NULL;

found:

#ifdef CONFIG_ZONE_DMA

		if (flags & GFP_DMA)

mm/slub.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}