Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[mv-sheeva.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 1db4d7313853c948ed20960ff3dc3ced3b7aca16..e291f5e1afbb3acd9d53ad3646527e2f06c3169f 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3263,6 +3263,7 @@ static void drain_array_locked(kmem_cache_t *cachep,
 
 /**
  * cache_reap - Reclaim memory from caches.
+ * @unused: unused parameter
  *
  * Called from workqueue/eventd every few seconds.
  * Purpose: