Commit 953b2f1e authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar

include/asm-x86/string_64.h: checkpatch cleanups - formatting only

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 06b0f574
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
/* Written 2002 by Andi Kleen */ /* Written 2002 by Andi Kleen */
/* Only used for special circumstances. Stolen from i386/string.h */ /* Only used for special circumstances. Stolen from i386/string.h */
static __always_inline void * static __always_inline void *__inline_memcpy(void *to, const void *from, size_t n)
__inline_memcpy(void * to, const void * from, size_t n)
{ {
unsigned long d0, d1, d2; unsigned long d0, d1, d2;
__asm__ __volatile__( asm volatile("rep ; movsl\n\t"
"rep ; movsl\n\t"
"testb $2,%b4\n\t" "testb $2,%b4\n\t"
"je 1f\n\t" "je 1f\n\t"
"movsw\n" "movsw\n"
...@@ -20,9 +18,9 @@ __asm__ __volatile__( ...@@ -20,9 +18,9 @@ __asm__ __volatile__(
"movsb\n" "movsb\n"
"2:" "2:"
: "=&c" (d0), "=&D" (d1), "=&S" (d2) : "=&c" (d0), "=&D" (d1), "=&S" (d2)
:"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from) : "0" (n / 4), "q" (n), "1" ((long)to), "2" ((long)from)
: "memory"); : "memory");
return (to); return to;
} }
/* Even with __builtin_ the compiler may decide to use the out of line /* Even with __builtin_ the compiler may decide to use the out of line
...@@ -33,27 +31,29 @@ return (to); ...@@ -33,27 +31,29 @@ return (to);
extern void *memcpy(void *to, const void *from, size_t len); extern void *memcpy(void *to, const void *from, size_t len);
#else #else
extern void *__memcpy(void *to, const void *from, size_t len); extern void *__memcpy(void *to, const void *from, size_t len);
#define memcpy(dst,src,len) \ #define memcpy(dst, src, len) \
({ size_t __len = (len); \ ({ \
size_t __len = (len); \
void *__ret; \ void *__ret; \
if (__builtin_constant_p(len) && __len >= 64) \ if (__builtin_constant_p(len) && __len >= 64) \
__ret = __memcpy((dst),(src),__len); \ __ret = __memcpy((dst), (src), __len); \
else \ else \
__ret = __builtin_memcpy((dst),(src),__len); \ __ret = __builtin_memcpy((dst), (src), __len); \
__ret; }) __ret; \
})
#endif #endif
#define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMSET
void *memset(void *s, int c, size_t n); void *memset(void *s, int c, size_t n);
#define __HAVE_ARCH_MEMMOVE #define __HAVE_ARCH_MEMMOVE
void * memmove(void * dest,const void *src,size_t count); void *memmove(void *dest, const void *src, size_t count);
int memcmp(const void * cs,const void * ct,size_t count); int memcmp(const void *cs, const void *ct, size_t count);
size_t strlen(const char * s); size_t strlen(const char *s);
char *strcpy(char * dest,const char *src); char *strcpy(char *dest, const char *src);
char *strcat(char * dest, const char * src); char *strcat(char *dest, const char *src);
int strcmp(const char * cs,const char * ct); int strcmp(const char *cs, const char *ct);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment