| Message ID | alpine.LFD.2.20.1605290534320.11938@localhost.localdomain |
|---|---|
| State | Superseded |
| Headers | show |
Hi, 2016-05-29 11:36 GMT+02:00 Robert P. J. Day <rpjday@crashcourse.ca>: > $ git diff --stat > arch/microblaze/include/asm/string.h | 2 -- > arch/powerpc/lib/ppcstring.S | 7 ------- > include/linux/string.h | 4 ---- > lib/string.c | 24 ------------------------ > 4 files changed, 37 deletions(-) > $ > Commit message is pretty weird. Just write there why you are doing it. Anyway for microblaze part here is my Acked-by: Michal Simek <michal.simek@xilinx.com> if you fix that commit message. Thanks, Michal
On Mon, 30 May 2016, Michal Simek wrote: > Hi, > > 2016-05-29 11:36 GMT+02:00 Robert P. J. Day <rpjday@crashcourse.ca>: > $ git diff --stat > arch/microblaze/include/asm/string.h | 2 -- > arch/powerpc/lib/ppcstring.S | 7 ------- > include/linux/string.h | 4 ---- > lib/string.c | 24 ------------------------ > 4 files changed, 37 deletions(-) > $ > > > Commit message is pretty weird. Just write there why you are doing it. > > Anyway for microblaze part here is my > Acked-by: Michal Simek <michal.simek@xilinx.com> > if you fix that commit message. ok, i'll resubmit a v2 shortly. rday
diff --git a/arch/microblaze/include/asm/string.h b/arch/microblaze/include/asm/string.h index 724f5bd..8f67ec7 100644 --- a/arch/microblaze/include/asm/string.h +++ b/arch/microblaze/include/asm/string.h @@ -17,13 +17,11 @@ #define __MICROBLAZE_STRING_H__ #if 0 -#define __HAVE_ARCH_BCOPY #define __HAVE_ARCH_MEMCPY #define __HAVE_ARCH_MEMSET #define __HAVE_ARCH_MEMMOVE extern void *memcpy (void *, const void *, __kernel_size_t); -extern void bcopy (const char *, char *, int); extern void *memset (void *, int, __kernel_size_t); extern void *memmove (void *, const void *, __kernel_size_t); #endif diff --git a/arch/powerpc/lib/ppcstring.S b/arch/powerpc/lib/ppcstring.S index 8152ac9..56bb3b8 100644 --- a/arch/powerpc/lib/ppcstring.S +++ b/arch/powerpc/lib/ppcstring.S @@ -92,13 +92,6 @@ memset: bdnz 8b blr - .globl bcopy -bcopy: - mr r6,r3 - mr r3,r4 - mr r4,r6 - b memcpy - .globl memmove memmove: cmplw 0,r3,r4 diff --git a/include/linux/string.h b/include/linux/string.h index c7047ba..091ccab 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -20,10 +20,6 @@ extern __kernel_size_t strspn(const char *,const char *); */ #include <asm/string.h> -#ifndef __HAVE_ARCH_BCOPY -char *bcopy(const char *src, char *dest, int count); -#endif - #ifndef __HAVE_ARCH_STRCPY extern char * strcpy(char *,const char *); #endif diff --git a/lib/string.c b/lib/string.c index 87c9a40..67d5f6a 100644 --- a/lib/string.c +++ b/lib/string.c @@ -461,30 +461,6 @@ void * memset(void * s,int c,size_t count) } #endif -#ifndef __HAVE_ARCH_BCOPY -/** - * bcopy - Copy one area of memory to another - * @src: Where to copy from - * @dest: Where to copy to - * @count: The size of the area. - * - * Note that this is the same as memcpy(), with the arguments reversed. - * memcpy() is the standard, bcopy() is a legacy BSD function. - * - * You should not use this function to access IO space, use memcpy_toio() - * or memcpy_fromio() instead. - */ -char * bcopy(const char * src, char * dest, int count) -{ - char *tmp = dest; - - while (count--) - *tmp++ = *src++; - - return dest; -} -#endif - #ifndef __HAVE_ARCH_MEMCPY /** * memcpy - Copy one area of memory to another
$ git diff --stat arch/microblaze/include/asm/string.h | 2 -- arch/powerpc/lib/ppcstring.S | 7 ------- include/linux/string.h | 4 ---- lib/string.c | 24 ------------------------ 4 files changed, 37 deletions(-) $ Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> --- rday