Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/mm/slab.c |    4 ++++
 1 files changed, 4 insertions(+)

diff -puN mm/slab.c~slab-latency-fix mm/slab.c
--- 25/mm/slab.c~slab-latency-fix	2004-08-24 22:08:01.124240544 -0700
+++ 25-akpm/mm/slab.c	2004-08-24 22:08:01.129239784 -0700
@@ -2690,6 +2690,10 @@ static void enable_cpucache (kmem_cache_
 	if (limit > 32)
 		limit = 32;
 #endif
+#ifdef CONFIG_PREEMPT
+	if (limit > 16)
+		limit = 16;
+#endif
 	err = do_tune_cpucache(cachep, limit, (limit+1)/2, shared);
 	if (err)
 		printk(KERN_ERR "enable_cpucache failed for %s, error %d.\n",
_