Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4268bd3 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: Disable NUMA remote node defragmentation by default
parents 5b51a7e9 e2cb96b7

mm/slub.c

+2 −2
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags, 


	s->refcount = 1;

#ifdef CONFIG_NUMA

	s->remote_node_defrag_ratio = 100;

	s->remote_node_defrag_ratio = 1000;

#endif

	if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA))

		goto error;
@@ -4058,7 +4058,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s, 
	if (err)

		return err;



	if (ratio < 100)

	if (ratio <= 100)

		s->remote_node_defrag_ratio = ratio * 10;



	return length;