From: Andrew Morton <akpm@osdl.org>

Let's try the Linus trick to get rid of yet another ARCH_HAS_FOO.

Cc: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: Andi Kleen <ak@suse.de>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-x86_64/string.h |    2 +-
 include/linux/string.h      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN include/asm-x86_64/string.h~add-memcpy_uncached_read-tidy include/asm-x86_64/string.h
--- a/include/asm-x86_64/string.h~add-memcpy_uncached_read-tidy
+++ a/include/asm-x86_64/string.h
@@ -39,8 +39,8 @@ extern void *__memcpy(void *to, const vo
 		 __ret = __builtin_memcpy((dst),(src),__len);	\
 	   __ret; }) 
 
-#define __HAVE_ARCH_MEMCPY_UNCACHED_READ
 extern void *memcpy_uncached_read(void *to, const void *from, size_t len);
+#define memcpy_uncached_read memcpy_uncached_read
 
 #define __HAVE_ARCH_MEMSET
 void *memset(void *s, int c, size_t n);
diff -puN include/linux/string.h~add-memcpy_uncached_read-tidy include/linux/string.h
--- a/include/linux/string.h~add-memcpy_uncached_read-tidy
+++ a/include/linux/string.h
@@ -85,7 +85,7 @@ extern void * memset(void *,int,__kernel
 #ifndef __HAVE_ARCH_MEMCPY
 extern void * memcpy(void *,const void *,__kernel_size_t);
 #endif
-#ifndef __HAVE_ARCH_MEMCPY_UNCACHED_READ
+#ifndef memcpy_uncached_read
 #define memcpy_uncached_read(dest, src, count) memcpy((dest), (src), (count))
 #endif
 #ifndef __HAVE_ARCH_MEMMOVE
_