From 16f28f28e717e49b457fe4ea73354863ca5e4f78 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 9 Sep 2005 13:10:16 -0700
Subject: [PATCH] --- yaml --- r: 8244 b: refs/heads/master c:
 80e93effce55044c5a7fa96e8b313640a80bd4e9 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/slab.c    | 2 ++
 trunk/mm/vmalloc.c | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a3c8bbfc7948..cda094090fd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af97c7220a0376beed827e72e3bb27731af7109d
+refs/heads/master: 80e93effce55044c5a7fa96e8b313640a80bd4e9
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index a041c5378dfa..05a391059fe1 100644
--- a/trunk/mm/slab.c
+++ b/trunk/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.
  */
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 67b358e57ef6..13c3d82968ae 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -332,9 +332,10 @@ void __vunmap(void *addr, int deallocate_pages)
  *	@addr:		memory base address
  *
  *	Free the virtually contiguous memory area starting at @addr, as
- *	obtained from vmalloc(), vmalloc_32() or __vmalloc().
+ *	obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is
+ *	NULL, no operation is performed.
  *
- *	May not be called in interrupt context.
+ *	Must not be called in interrupt context.
  */
 void vfree(void *addr)
 {
@@ -352,7 +353,7 @@ EXPORT_SYMBOL(vfree);
  *	Free the virtually contiguous memory area starting at @addr,
  *	which was created from the page array passed to vmap().
  *
- *	May not be called in interrupt context.
+ *	Must not be called in interrupt context.
  */
 void vunmap(void *addr)
 {