summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2012-02-03 15:37:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-03 16:16:40 -0800
commita1b58c237b73f10221b31e05b47a6565558207ef (patch)
treead0651849cc19bb894a3f7d312df4e0c54e6bbd8
parent070f420b35a2c078ca2bd2a0d31dd7b5001d411c (diff)
downloadlinux-3.10-a1b58c237b73f10221b31e05b47a6565558207ef.tar.gz
linux-3.10-a1b58c237b73f10221b31e05b47a6565558207ef.tar.bz2
linux-3.10-a1b58c237b73f10221b31e05b47a6565558207ef.zip
xtensa: fix memscan()
Defining memscan() as memchr() is wrong, because the return values of memscan() and memchr() are different when the character is not found. So use the generic memscan() implementation to fix this. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/xtensa/include/asm/string.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/include/asm/string.h b/arch/xtensa/include/asm/string.h
index 5fb8c27cbef..405a8c49ff2 100644
--- a/arch/xtensa/include/asm/string.h
+++ b/arch/xtensa/include/asm/string.h
@@ -118,7 +118,4 @@ extern void *memmove(void *__dest, __const__ void *__src, size_t __n);
/* Don't build bcopy at all ... */
#define __HAVE_ARCH_BCOPY
-#define __HAVE_ARCH_MEMSCAN
-#define memscan memchr
-
#endif /* _XTENSA_STRING_H */