v2.4.3 -> v2.4.3.1

  - Bob Tracy: Cyrix MTRR setup fix (don't make it twice as big as asked
  for)
  - Trond Myklebust: rpciod needs to be PF_MEMALLOC to avoid deadlocks on
  memory allocation when writing out NFS data under low memory conditions.
  Fix up BKL and RPC interactions.
  - Jeff Garzik: tulip network driver update
  - fix truncate to call down to the filesystem with the kernel lock.
  - David Mosberger: ia64 update
  - David Mosberger: simplify ELF program header generation.
  - Alan Cox: merge from -ac series
  - Jeff Garzik: make serial.c recognize modem devices properly

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/string.c b/lib/string.c
index 6ebb2c56333f..0bdf942391c0 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -350,6 +350,8 @@ char * strsep(char **s, const char * ct)
  * @s: Pointer to the start of the area.
  * @c: The byte to fill the area with
  * @count: The size of the area.
+ *
+ * Do not use memset() to access IO space, use memset_io() instead.
  */
 void * memset(void * s,int c,size_t count)
 {
@@ -369,11 +371,11 @@ void * memset(void * s,int c,size_t count)
  * @dest: Where to copy to
  * @count: The size of the area.
  *
- * When using copies for I/O remember that bcopy and memcpy are entitled
- * to do out of order writes and may well exactly that.
+ * Note that this is the same as memcpy(), with the arguments reversed.
+ * memcpy() is the standard, bcopy() is a legacy BSD function.
  *
- * Note that this is the same as memcpy, with the arguments reversed. memcpy
- * is the standard, bcopy is a legacy BSD function.
+ * You should not use this function to access IO space, use memcpy_toio()
+ * or memcpy_fromio() instead.
  */
 char * bcopy(const char * src, char * dest, int count)
 {
@@ -393,8 +395,8 @@ char * bcopy(const char * src, char * dest, int count)
  * @src: Where to copy from
  * @count: The size of the area.
  *
- * When using copies for I/O remember that bcopy and memcpy are entitled
- * to do out of order writes and may well exactly that.
+ * You should not use this function to access IO space, use memcpy_toio()
+ * or memcpy_fromio() instead.
  */
 void * memcpy(void * dest,const void *src,size_t count)
 {
@@ -414,7 +416,7 @@ void * memcpy(void * dest,const void *src,size_t count)
  * @src: Where to copy from
  * @count: The size of the area.
  *
- * memmove copes with overlapping areas.
+ * Unlike memcpy(), memmove() copes with overlapping areas.
  */
 void * memmove(void * dest,const void *src,size_t count)
 {
@@ -439,7 +441,7 @@ void * memmove(void * dest,const void *src,size_t count)
 
 #ifndef __HAVE_ARCH_MEMCMP
 /**
- * memmove - Compare two areas of memory
+ * memcmp - Compare two areas of memory
  * @cs: One area of memory
  * @ct: Another area of memory
  * @count: The size of the area.