Merge tag 'pm+acpi-fixes-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/tile/lib/strchr_64.c b/arch/tile/lib/strchr_64.c
index f39f9dc422b02e44853ff54e14a0dc3cdd277380..fe6e31c06f8deb1bc2d96ddc8f17bdb070105720 100644 (file)
--- a/arch/tile/lib/strchr_64.c
+++ b/arch/tile/lib/strchr_64.c
@@ -26,7 +26,7 @@ char *strchr(const char *s, int c)
        const uint64_t *p = (const uint64_t *)(s_int & -8);
 
        /* Create eight copies of the byte for which we are looking. */
-       const uint64_t goal = 0x0101010101010101ULL * (uint8_t) c;
+       const uint64_t goal = copy_byte(c);
 
        /* Read the first aligned word, but force bytes before the string to
         * match neither zero nor goal (we make sure the high bit of each