Merge branch 'for-4.14/block-postmerge' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / include / linux / string.h

diff --git a/include/linux/string.h b/include/linux/string.h
index 0bec4151b0eb9e7e570886749d52e8d693db7f7d..e1eeb0a8a9693083e31bb5e45720764b46578158 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -99,6 +99,36 @@ extern __kernel_size_t strcspn(const char *,const char *);
 #ifndef __HAVE_ARCH_MEMSET
 extern void * memset(void *,int,__kernel_size_t);
 #endif
+
+#ifndef __HAVE_ARCH_MEMSET16
+extern void *memset16(uint16_t *, uint16_t, __kernel_size_t);
+#endif
+
+#ifndef __HAVE_ARCH_MEMSET32
+extern void *memset32(uint32_t *, uint32_t, __kernel_size_t);
+#endif
+
+#ifndef __HAVE_ARCH_MEMSET64
+extern void *memset64(uint64_t *, uint64_t, __kernel_size_t);
+#endif
+
+static inline void *memset_l(unsigned long *p, unsigned long v,
+               __kernel_size_t n)
+{
+       if (BITS_PER_LONG == 32)
+               return memset32((uint32_t *)p, v, n);
+       else
+               return memset64((uint64_t *)p, v, n);
+}
+
+static inline void *memset_p(void **p, void *v, __kernel_size_t n)
+{
+       if (BITS_PER_LONG == 32)
+               return memset32((uint32_t *)p, (uintptr_t)v, n);
+       else
+               return memset64((uint64_t *)p, (uintptr_t)v, n);
+}
+
 #ifndef __HAVE_ARCH_MEMCPY
 extern void * memcpy(void *,const void *,__kernel_size_t);
 #endif