Merge /spare/repo/linux-2.6/

1 files changed, 7 insertions, 0 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 840742641152..93cbbbb39f42 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2620,6 +2620,12 @@ unsigned int kmem_cache_size(kmem_cache_t *cachep)
 }
 EXPORT_SYMBOL(kmem_cache_size);
 
+const char *kmem_cache_name(kmem_cache_t *cachep)
+{
+        return cachep->name;
+}
+EXPORT_SYMBOL_GPL(kmem_cache_name);
+
 struct ccupdate_struct {
         kmem_cache_t *cachep;
         struct array_cache *new[NR_CPUS];
@@ -2845,6 +2851,7 @@ next:
         }
         check_irq_on();
         up(&cache_chain_sem);
+        drain_remote_pages();
         /* Setup the next iteration */
         schedule_delayed_work(&__get_cpu_var(reap_work), REAPTIMEOUT_CPUC + smp_processor_id());
 }