diff options
| author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
|---|---|---|
| committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
| commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
| tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c | |
| parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
| parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
| download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip | |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c')
| -rw-r--r-- | xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c b/xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c deleted file mode 100644 index 4cb37b6e50..0000000000 --- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/lib/memcpy.c +++ /dev/null @@ -1,19 +0,0 @@ -#include <linux/config.h> -#include <linux/string.h> - -#undef memcpy -#undef memset - -void * memcpy(void * to, const void * from, size_t n) -{ -#ifdef CONFIG_X86_USE_3DNOW - return __memcpy3d(to, from, n); -#else - return __memcpy(to, from, n); -#endif -} - -void * memset(void * s, int c, size_t count) -{ - return __memset(s, c, count); -} |