Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6-git-rfc3542

[linux-2.6] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index a041c5378dfa59895c411d07b88cf69153275a11..05a391059fe1d92b58a85fb5cb1e3039f6fa6468 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2998,6 +2998,8 @@ EXPORT_SYMBOL(kzalloc);
  * kfree - free previously allocated memory
  * @objp: pointer returned by kmalloc.
  *
+ * If @objp is NULL, no operation is performed.
+ *
  * Don't free memory not originally allocated by kmalloc()
  * or you will run into trouble.
  */