diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:03:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:27 -0400 |
commit | 953b2f1ed6f2642e58e7c5b8c1385d132f1b5685 (patch) | |
tree | 00ed406dbaae64594f7ffc1210747a7d94515df9 /include/asm-x86/string_64.h | |
parent | 06b0f574eafdd26d325ce5ab3c38522d0cdd7b7c (diff) |
include/asm-x86/string_64.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/string_64.h')
-rw-r--r-- | include/asm-x86/string_64.h | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/include/asm-x86/string_64.h b/include/asm-x86/string_64.h index e583da7918fb..52b5ab383395 100644 --- a/include/asm-x86/string_64.h +++ b/include/asm-x86/string_64.h | |||
@@ -3,26 +3,24 @@ | |||
3 | 3 | ||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | 5 | ||
6 | /* Written 2002 by Andi Kleen */ | 6 | /* Written 2002 by Andi Kleen */ |
7 | 7 | ||
8 | /* Only used for special circumstances. Stolen from i386/string.h */ | 8 | /* Only used for special circumstances. Stolen from i386/string.h */ |
9 | static __always_inline void * | 9 | static __always_inline void *__inline_memcpy(void *to, const void *from, size_t n) |
10 | __inline_memcpy(void * to, const void * from, size_t n) | ||
11 | { | 10 | { |
12 | unsigned long d0, d1, d2; | 11 | unsigned long d0, d1, d2; |
13 | __asm__ __volatile__( | 12 | asm volatile("rep ; movsl\n\t" |
14 | "rep ; movsl\n\t" | 13 | "testb $2,%b4\n\t" |
15 | "testb $2,%b4\n\t" | 14 | "je 1f\n\t" |
16 | "je 1f\n\t" | 15 | "movsw\n" |
17 | "movsw\n" | 16 | "1:\ttestb $1,%b4\n\t" |
18 | "1:\ttestb $1,%b4\n\t" | 17 | "je 2f\n\t" |
19 | "je 2f\n\t" | 18 | "movsb\n" |
20 | "movsb\n" | 19 | "2:" |
21 | "2:" | 20 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) |
22 | : "=&c" (d0), "=&D" (d1), "=&S" (d2) | 21 | : "0" (n / 4), "q" (n), "1" ((long)to), "2" ((long)from) |
23 | :"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from) | 22 | : "memory"); |
24 | : "memory"); | 23 | return to; |
25 | return (to); | ||
26 | } | 24 | } |
27 | 25 | ||
28 | /* Even with __builtin_ the compiler may decide to use the out of line | 26 | /* Even with __builtin_ the compiler may decide to use the out of line |
@@ -32,28 +30,30 @@ return (to); | |||
32 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 | 30 | #if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 |
33 | extern void *memcpy(void *to, const void *from, size_t len); | 31 | extern void *memcpy(void *to, const void *from, size_t len); |
34 | #else | 32 | #else |
35 | extern void *__memcpy(void *to, const void *from, size_t len); | 33 | extern void *__memcpy(void *to, const void *from, size_t len); |
36 | #define memcpy(dst,src,len) \ | 34 | #define memcpy(dst, src, len) \ |
37 | ({ size_t __len = (len); \ | 35 | ({ \ |
38 | void *__ret; \ | 36 | size_t __len = (len); \ |
39 | if (__builtin_constant_p(len) && __len >= 64) \ | 37 | void *__ret; \ |
40 | __ret = __memcpy((dst),(src),__len); \ | 38 | if (__builtin_constant_p(len) && __len >= 64) \ |
41 | else \ | 39 | __ret = __memcpy((dst), (src), __len); \ |
42 | __ret = __builtin_memcpy((dst),(src),__len); \ | 40 | else \ |
43 | __ret; }) | 41 | __ret = __builtin_memcpy((dst), (src), __len); \ |
42 | __ret; \ | ||
43 | }) | ||
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | #define __HAVE_ARCH_MEMSET | 46 | #define __HAVE_ARCH_MEMSET |
47 | void *memset(void *s, int c, size_t n); | 47 | void *memset(void *s, int c, size_t n); |
48 | 48 | ||
49 | #define __HAVE_ARCH_MEMMOVE | 49 | #define __HAVE_ARCH_MEMMOVE |
50 | void * memmove(void * dest,const void *src,size_t count); | 50 | void *memmove(void *dest, const void *src, size_t count); |
51 | 51 | ||
52 | int memcmp(const void * cs,const void * ct,size_t count); | 52 | int memcmp(const void *cs, const void *ct, size_t count); |
53 | size_t strlen(const char * s); | 53 | size_t strlen(const char *s); |
54 | char *strcpy(char * dest,const char *src); | 54 | char *strcpy(char *dest, const char *src); |
55 | char *strcat(char * dest, const char * src); | 55 | char *strcat(char *dest, const char *src); |
56 | int strcmp(const char * cs,const char * ct); | 56 | int strcmp(const char *cs, const char *ct); |
57 | 57 | ||
58 | #endif /* __KERNEL__ */ | 58 | #endif /* __KERNEL__ */ |
59 | 59 | ||