diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 14:26:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-27 14:26:48 -0400 |
| commit | 84eda28060f7e7d5f91f81f928532af13b9e44b2 (patch) | |
| tree | f0b7feeca9b6a21a43f279fb3b566eef1c16584d /mm | |
| parent | b387e41e523c1aa347cff055455d0dd129357df4 (diff) | |
| parent | 2164d3344693d2d4799fe91836d61f55516cbdf0 (diff) | |
Merge branch 'kmap_atomic' of git://github.com/congwang/linux
Pull final kmap_atomic cleanups from Cong Wang:
"This should be the final round of cleanup, as the definitions of enum
km_type finally get removed from the whole tree. The patches have
been in linux-next for a long time."
* 'kmap_atomic' of git://github.com/congwang/linux:
pipe: remove KM_USER0 from comments
vmalloc: remove KM_USER0 from comments
feature-removal-schedule.txt: remove kmap_atomic(page, km_type)
tile: remove km_type definitions
um: remove km_type definitions
asm-generic: remove km_type definitions
avr32: remove km_type definitions
frv: remove km_type definitions
powerpc: remove km_type definitions
arm: remove km_type definitions
highmem: remove the deprecated form of kmap_atomic
tile: remove usage of enum km_type
frv: remove the second parameter of kmap_atomic_primary()
jbd2: remove the second argument of kmap_atomic
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/vmalloc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 2aad49981b5..c7ac8e1b3ac 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
| @@ -1975,9 +1975,7 @@ static int aligned_vwrite(char *buf, char *addr, unsigned long count) | |||
| 1975 | * IOREMAP area is treated as memory hole and no copy is done. | 1975 | * IOREMAP area is treated as memory hole and no copy is done. |
| 1976 | * | 1976 | * |
| 1977 | * If [addr...addr+count) doesn't includes any intersects with alive | 1977 | * If [addr...addr+count) doesn't includes any intersects with alive |
| 1978 | * vm_struct area, returns 0. | 1978 | * vm_struct area, returns 0. @buf should be kernel's buffer. |
| 1979 | * @buf should be kernel's buffer. Because this function uses KM_USER0, | ||
| 1980 | * the caller should guarantee KM_USER0 is not used. | ||
| 1981 | * | 1979 | * |
| 1982 | * Note: In usual ops, vread() is never necessary because the caller | 1980 | * Note: In usual ops, vread() is never necessary because the caller |
| 1983 | * should know vmalloc() area is valid and can use memcpy(). | 1981 | * should know vmalloc() area is valid and can use memcpy(). |
| @@ -2051,9 +2049,7 @@ finished: | |||
| 2051 | * IOREMAP area is treated as memory hole and no copy is done. | 2049 | * IOREMAP area is treated as memory hole and no copy is done. |
| 2052 | * | 2050 | * |
| 2053 | * If [addr...addr+count) doesn't includes any intersects with alive | 2051 | * If [addr...addr+count) doesn't includes any intersects with alive |
| 2054 | * vm_struct area, returns 0. | 2052 | * vm_struct area, returns 0. @buf should be kernel's buffer. |
| 2055 | * @buf should be kernel's buffer. Because this function uses KM_USER0, | ||
| 2056 | * the caller should guarantee KM_USER0 is not used. | ||
| 2057 | * | 2053 | * |
| 2058 | * Note: In usual ops, vwrite() is never necessary because the caller | 2054 | * Note: In usual ops, vwrite() is never necessary because the caller |
| 2059 | * should know vmalloc() area is valid and can use memcpy(). | 2055 | * should know vmalloc() area is valid and can use memcpy(). |