Merge tag 'scsi-postmerge' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[sfrench/cifs-2.6.git] / arch / arm / include / asm / string.h

diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h
index f54a3136aac6e36efbc3a809c1937fa401b39a8f..111a1d8a41ddfad3c8fd64e79f0df6d8c74af31b 100644 (file)
--- a/arch/arm/include/asm/string.h
+++ b/arch/arm/include/asm/string.h
@@ -39,18 +39,4 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)
        return __memset64(p, v, n * 8, v >> 32);
 }
 
-extern void __memzero(void *ptr, __kernel_size_t n);
-
-#define memset(p,v,n)                                                  \
-       ({                                                              \
-               void *__p = (p); size_t __n = n;                        \
-               if ((__n) != 0) {                                       \
-                       if (__builtin_constant_p((v)) && (v) == 0)      \
-                               __memzero((__p),(__n));                 \
-                       else                                            \
-                               memset((__p),(v),(__n));                \
-               }                                                       \
-               (__p);                                                  \
-       })
-
 #endif