This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-sparc64 / string.h

diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h
index c1a4f1d..88348de 100644 (file)
--- a/include/asm-sparc64/string.h
+++ b/include/asm-sparc64/string.h
@@ -16,7 +16,9 @@
 #include <asm/asi.h>
 
 extern void __memmove(void *,const void *,__kernel_size_t);
+extern __kernel_size_t __memcpy(void *,const void *,__kernel_size_t);
 extern void *__memset(void *,int,__kernel_size_t);
+extern void *__builtin_memcpy(void *,const void *,__kernel_size_t);
 extern void *__builtin_memset(void *,int,__kernel_size_t);
 
 #ifndef EXPORT_SYMTAB_STROPS
@@ -35,7 +37,29 @@ extern void *__builtin_memset(void *,int,__kernel_size_t);
 
 #define __HAVE_ARCH_MEMCPY
 
-extern void * memcpy(void *,const void *,__kernel_size_t);
+static inline void *__constant_memcpy(void *to, const void *from, __kernel_size_t n)
+{
+       if(n) {
+               if(n <= 32) {
+                       __builtin_memcpy(to, from, n);
+               } else {
+                       __memcpy(to, from, n);
+               }
+       }
+       return to;
+}
+
+static inline void *__nonconstant_memcpy(void *to, const void *from, __kernel_size_t n)
+{
+       __memcpy(to, from, n);
+       return to;
+}
+
+#undef memcpy
+#define memcpy(t, f, n) \
+(__builtin_constant_p(n) ? \
+ __constant_memcpy((t),(f),(n)) : \
+ __nonconstant_memcpy((t),(f),(n)))
 
 #define __HAVE_ARCH_MEMSET