Merge tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / tile / lib / memchr_64.c

diff --git a/arch/tile/lib/memchr_64.c b/arch/tile/lib/memchr_64.c
index 6f867dbf7c56df79a25ebcc091dfb9b5fa5321b7..f8196b3a950ef4f6fc8b97e615b7d4cd1e352e55 100644 (file)
--- a/arch/tile/lib/memchr_64.c
+++ b/arch/tile/lib/memchr_64.c
@@ -36,7 +36,7 @@ void *memchr(const void *s, int c, size_t n)
        p = (const uint64_t *)(s_int & -8);
 
        /* Create eight copies of the byte for which we are looking. */
-       goal = 0x0101010101010101ULL * (uint8_t) c;
+       goal = copy_byte(c);
 
        /* Read the first word, but munge it so that bytes before the array
         * will not match goal.