diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 14:33:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-27 14:33:06 -0700 |
commit | e4268bd3b2b0380faaa62fad3e8d705eea21d124 (patch) | |
tree | de2b8900714a27bd2f889b77397d76be21fcbb20 /mm | |
parent | 5b51a7e9d84f19df4d532ebf5624dbb8ad0d6c9c (diff) | |
parent | e2cb96b7ecba46888cf00252ffdb8ef1e92c4258 (diff) | |
download | blackbird-op-linux-e4268bd3b2b0380faaa62fad3e8d705eea21d124.tar.gz blackbird-op-linux-e4268bd3b2b0380faaa62fad3e8d705eea21d124.zip |
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
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 4f5b96149458..fb486d5540f8 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -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; |