diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /mm/highmem.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'mm/highmem.c')
| -rw-r--r-- | mm/highmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index 9c1e627f282e..bed8a8bfd01f 100644 --- a/mm/highmem.c +++ b/mm/highmem.c | |||
| @@ -220,7 +220,7 @@ EXPORT_SYMBOL(kmap_high); | |||
| 220 | * @page: &struct page to pin | 220 | * @page: &struct page to pin |
| 221 | * | 221 | * |
| 222 | * Returns the page's current virtual memory address, or NULL if no mapping | 222 | * Returns the page's current virtual memory address, or NULL if no mapping |
| 223 | * exists. When and only when a non null address is returned then a | 223 | * exists. If and only if a non null address is returned then a |
| 224 | * matching call to kunmap_high() is necessary. | 224 | * matching call to kunmap_high() is necessary. |
| 225 | * | 225 | * |
| 226 | * This can be called from any context. | 226 | * This can be called from any context. |