Merge remote-tracking branch 'spi/for-next'

[karo-tx-linux.git] / arch / tile / lib / memset_64.c

diff --git a/arch/tile/lib/memset_64.c b/arch/tile/lib/memset_64.c
index 3873085711d58fce89b714ed20dd1a090ceaf486..03ef69cd73decac97b4e6e8c584c800ca0fc58e7 100644 (file)
--- a/arch/tile/lib/memset_64.c
+++ b/arch/tile/lib/memset_64.c
@@ -12,13 +12,11 @@
  *   more details.
  */
 
-#include <arch/chip.h>
-
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/module.h>
-
-#undef memset
+#include <arch/chip.h>
+#include "string-endian.h"
 
 void *memset(void *s, int c, size_t n)
 {
@@ -70,8 +68,7 @@ void *memset(void *s, int c, size_t n)
        n64 = n >> 3;
 
        /* Tile input byte out to 64 bits. */
-       /* KLUDGE */
-       v64 = 0x0101010101010101ULL * (uint8_t)c;
+       v64 = copy_byte(c);
 
        /* This must be at least 8 or the following loop doesn't work. */
 #define CACHE_LINE_SIZE_IN_DOUBLEWORDS (CHIP_L2_LINE_SIZE() / 8)