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
This commit is contained in:
Linus Torvalds 2008-08-27 14:33:06 -07:00
commit e4268bd3b2

View File

@ -2312,7 +2312,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
s->refcount = 1; s->refcount = 1;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
s->remote_node_defrag_ratio = 100; s->remote_node_defrag_ratio = 1000;
#endif #endif
if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA)) if (!init_kmem_cache_nodes(s, gfpflags & ~SLUB_DMA))
goto error; goto error;
@ -4058,7 +4058,7 @@ static ssize_t remote_node_defrag_ratio_store(struct kmem_cache *s,
if (err) if (err)
return err; return err;
if (ratio < 100) if (ratio <= 100)
s->remote_node_defrag_ratio = ratio * 10; s->remote_node_defrag_ratio = ratio * 10;
return length; return length;