diff options
| author | Vivek Goyal <vgoyal@redhat.com> | 2014-03-18 15:26:38 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-03-19 15:43:59 -0700 |
| commit | 820e8feca06ff744f60e5036c3178dde40b91afc (patch) | |
| tree | 5db82aa71deb82d95dafa776beb30fee85ff1d0e /arch/x86/boot/compressed/misc.c | |
| parent | c041b5ad8640dd89ccf1411cd2636ef7c1cfee92 (diff) | |
x86, boot: Move optimized memcpy() 32/64 bit versions to compressed/string.c
Move optimized versions of memcpy to compressed/string.c This will allow
any other code to use these functions too if need be in future. Again
trying to put definition in a common place instead of hiding it in misc.c
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Link: http://lkml.kernel.org/r/1395170800-11059-4-git-send-email-vgoyal@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/boot/compressed/misc.c')
| -rw-r--r-- | arch/x86/boot/compressed/misc.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index 196eaf373a0..3100092b134 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -10,6 +10,7 @@ */ #include "misc.h" +#include "../string.h" /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically @@ -110,7 +111,6 @@ static void error(char *m); struct boot_params *real_mode; /* Pointer to real-mode data */ void *memset(void *s, int c, size_t n); -void *memcpy(void *dest, const void *src, size_t n); memptr free_mem_ptr; memptr free_mem_end_ptr; @@ -225,35 +225,6 @@ void *memset(void *s, int c, size_t n) ss[i] = c; return s; } -#ifdef CONFIG_X86_32 -void *memcpy(void *dest, const void *src, size_t n) -{ - int d0, d1, d2; - asm volatile( - "rep ; movsl\n\t" - "movl %4,%%ecx\n\t" - "rep ; movsb\n\t" - : "=&c" (d0), "=&D" (d1), "=&S" (d2) - : "0" (n >> 2), "g" (n & 3), "1" (dest), "2" (src) - : "memory"); - - return dest; -} -#else -void *memcpy(void *dest, const void *src, size_t n) -{ - long d0, d1, d2; - asm volatile( - "rep ; movsq\n\t" - "movq %4,%%rcx\n\t" - "rep ; movsb\n\t" - : "=&c" (d0), "=&D" (d1), "=&S" (d2) - : "0" (n >> 3), "g" (n & 7), "1" (dest), "2" (src) - : "memory"); - - return dest; -} -#endif static void error(char *x) { |