diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-20 12:55:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 13:27:32 -0400 |
| commit | b7a40242c82cd73cfcea305f23e67d068dd8401a (patch) | |
| tree | 251b49d19cd7c371847ae1f951e1b537ca0e1c15 /lib/string.c | |
| parent | d26833bfce5e56017bea9f1f50838f20e18e7b7e (diff) | |
| parent | 9c6de47d53a3ce8df1642ae67823688eb98a190a (diff) | |
Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw
Conflicts:
drivers/spi/spi-dw-mid.c
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/string.c b/lib/string.c index 992bf30af759..f3c6ff596414 100644 --- a/lib/string.c +++ b/lib/string.c | |||
| @@ -807,9 +807,9 @@ void *memchr_inv(const void *start, int c, size_t bytes) | |||
| 807 | return check_bytes8(start, value, bytes); | 807 | return check_bytes8(start, value, bytes); |
| 808 | 808 | ||
| 809 | value64 = value; | 809 | value64 = value; |
| 810 | #if defined(ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64 | 810 | #if defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) && BITS_PER_LONG == 64 |
| 811 | value64 *= 0x0101010101010101; | 811 | value64 *= 0x0101010101010101; |
| 812 | #elif defined(ARCH_HAS_FAST_MULTIPLIER) | 812 | #elif defined(CONFIG_ARCH_HAS_FAST_MULTIPLIER) |
| 813 | value64 *= 0x01010101; | 813 | value64 *= 0x01010101; |
| 814 | value64 |= value64 << 32; | 814 | value64 |= value64 << 32; |
| 815 | #else | 815 | #else |