maccess: rename strncpy_from_unsafe_user to strncpy_from_user_nofault

[linux-2.6-block.git] / mm / maccess.c

diff --git a/mm/maccess.c b/mm/maccess.c
index b3e15a8ec80fa0b345b0db9efa0577d4948d1ca0..41a494e3deac8fa27f0cddfe7378932a9d405e09 100644 (file)
--- a/mm/maccess.c
+++ b/mm/maccess.c
@@ -217,7 +217,7 @@ long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
 }
 
 /**
- * strncpy_from_unsafe_user: - Copy a NUL terminated string from unsafe user
+ * strncpy_from_user_nofault: - Copy a NUL terminated string from unsafe user
  *                             address.
  * @dst:   Destination address, in kernel space.  This buffer must be at
  *         least @count bytes long.
@@ -234,7 +234,7 @@ long __strncpy_from_unsafe(char *dst, const void *unsafe_addr, long count)
  * If @count is smaller than the length of the string, copies @count-1 bytes,
  * sets the last byte of @dst buffer to NUL and returns @count.
  */
-long strncpy_from_unsafe_user(char *dst, const void __user *unsafe_addr,
+long strncpy_from_user_nofault(char *dst, const void __user *unsafe_addr,
                              long count)
 {
        mm_segment_t old_fs = get_fs();