Merge mainline to 2.4.0-test4-pre5

1 files changed, 1 insertions, 1 deletions

diff --git a/mm/slab.c b/mm/slab.c
index a24e46582..a31f0f7e7 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1966,7 +1966,7 @@ int slabinfo_read_proc (char *page, char **start, off_t off,
 #define MAX_SLABINFO_WRITE 128
 /**
  * slabinfo_write_proc - SMP tuning for the slab allocator
- * @file:
+ * @file: unused
  * @buffer: user buffer
  * @count: data len
  * @data: unused