diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2005-09-09 16:10:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 17:03:43 -0400 |
commit | 80e93effce55044c5a7fa96e8b313640a80bd4e9 (patch) | |
tree | 339f0ac4c6d022ba048e109e51580c26ce4d252e /mm/vmalloc.c | |
parent | af97c7220a0376beed827e72e3bb27731af7109d (diff) |
[PATCH] update kfree, vfree, and vunmap kerneldoc
This patch clarifies NULL handling of kfree() and vfree(). I addition,
wording of calling context restriction for vfree() and vunmap() are changed
from "may not" to "must not."
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r-- | mm/vmalloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 67b358e57ef6..13c3d82968ae 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -332,9 +332,10 @@ void __vunmap(void *addr, int deallocate_pages) | |||
332 | * @addr: memory base address | 332 | * @addr: memory base address |
333 | * | 333 | * |
334 | * Free the virtually contiguous memory area starting at @addr, as | 334 | * Free the virtually contiguous memory area starting at @addr, as |
335 | * obtained from vmalloc(), vmalloc_32() or __vmalloc(). | 335 | * obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is |
336 | * NULL, no operation is performed. | ||
336 | * | 337 | * |
337 | * May not be called in interrupt context. | 338 | * Must not be called in interrupt context. |
338 | */ | 339 | */ |
339 | void vfree(void *addr) | 340 | void vfree(void *addr) |
340 | { | 341 | { |
@@ -352,7 +353,7 @@ EXPORT_SYMBOL(vfree); | |||
352 | * Free the virtually contiguous memory area starting at @addr, | 353 | * Free the virtually contiguous memory area starting at @addr, |
353 | * which was created from the page array passed to vmap(). | 354 | * which was created from the page array passed to vmap(). |
354 | * | 355 | * |
355 | * May not be called in interrupt context. | 356 | * Must not be called in interrupt context. |
356 | */ | 357 | */ |
357 | void vunmap(void *addr) | 358 | void vunmap(void *addr) |
358 | { | 359 | { |