1 files changed, 18 insertions, 4 deletions

diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c
index ecfb663e1fc1..834565d1607e 100644
--- a/arch/microblaze/lib/memset.c
+++ b/arch/microblaze/lib/memset.c
@@ -31,17 +31,30 @@
 #include <linux/string.h>
 
 #ifdef __HAVE_ARCH_MEMSET
+#ifndef CONFIG_OPT_LIB_FUNCTION
+void *memset(void *v_src, int c, __kernel_size_t n)
+{
+        char *src = v_src;
+
+        /* Truncate c to 8 bits */
+        c = (c & 0xFF);
+
+        /* Simple, byte oriented memset or the rest of count. */
+        while (n--)
+                *src++ = c;
+
+        return v_src;
+}
+#else /* CONFIG_OPT_LIB_FUNCTION */
 void *memset(void *v_src, int c, __kernel_size_t n)
 {
         char *src = v_src;
-#ifdef CONFIG_OPT_LIB_FUNCTION
         uint32_t *i_src;
         uint32_t w32 = 0;
-#endif
+
         /* Truncate c to 8 bits */
         c = (c & 0xFF);
 
-#ifdef CONFIG_OPT_LIB_FUNCTION
         if (unlikely(c)) {
                 /* Make a repeating word out of it */
                 w32 = c;
@@ -72,12 +85,13 @@ void *memset(void *v_src, int c, __kernel_size_t n)
 
                 src  = (void *)i_src;
         }
-#endif
+
         /* Simple, byte oriented memset or the rest of count. */
         while (n--)
                 *src++ = c;
 
         return v_src;
 }
+#endif /* CONFIG_OPT_LIB_FUNCTION */
 EXPORT_SYMBOL(memset);
 #endif /* __HAVE_ARCH_MEMSET */