diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2007-10-12 12:36:20 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-12 14:13:44 +1000 |
| commit | 9b4b8feb962f4b3e74768b7205f1f8f6cce87238 (patch) | |
| tree | 7d7c95d9024d0d47ebb5f4299efc8d7ef00fa3ec | |
| parent | d0c3d534a4388a465101b634a95f2ec586415254 (diff) | |
| download | linux-3.10-9b4b8feb962f4b3e74768b7205f1f8f6cce87238.tar.gz linux-3.10-9b4b8feb962f4b3e74768b7205f1f8f6cce87238.tar.bz2 linux-3.10-9b4b8feb962f4b3e74768b7205f1f8f6cce87238.zip | |
[POWERPC] Add memchr() to the bootwrapper
This adds a memchr() implementation to the bootwrapper, which will
be needed when libfdt is merged in.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/boot/string.S | 13 | ||||
| -rw-r--r-- | arch/powerpc/boot/string.h | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/boot/string.S b/arch/powerpc/boot/string.S index 2627558bcb7..643e4cb2f11 100644 --- a/arch/powerpc/boot/string.S +++ b/arch/powerpc/boot/string.S @@ -219,6 +219,19 @@ backwards_memcpy: mtctr r7 b 1b + .globl memchr +memchr: + cmpwi 0,r5,0 + blelr + mtctr r5 + addi r3,r3,-1 +1: lbzu r0,1(r3) + cmpw r0,r4 + beqlr + bdnz 1b + li r3,0 + blr + .globl memcmp memcmp: cmpwi 0,r5,0 diff --git a/arch/powerpc/boot/string.h b/arch/powerpc/boot/string.h index 4650030d104..50091cc0eed 100644 --- a/arch/powerpc/boot/string.h +++ b/arch/powerpc/boot/string.h @@ -14,6 +14,7 @@ extern size_t strnlen(const char *s, size_t count); extern void *memset(void *s, int c, size_t n); extern void *memmove(void *dest, const void *src, unsigned long n); extern void *memcpy(void *dest, const void *src, unsigned long n); +extern void *memchr(const void *s, int c, size_t n); extern int memcmp(const void *s1, const void *s2, size_t n); #endif /* _PPC_BOOT_STRING_H_ */ |