10 files changed, 24 insertions, 25 deletions

diff --git a/arch/microblaze/lib/ashldi3.c b/arch/microblaze/lib/ashldi3.c
index beb80f316095..1af904cd972d 100644
--- a/arch/microblaze/lib/ashldi3.c
+++ b/arch/microblaze/lib/ashldi3.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"
 
@@ -25,5 +25,4 @@ long long __ashldi3(long long u, word_type b)
 
         return w.ll;
 }
-
 EXPORT_SYMBOL(__ashldi3);
diff --git a/arch/microblaze/lib/ashrdi3.c b/arch/microblaze/lib/ashrdi3.c
index c884a912b660..32c334c05d04 100644
--- a/arch/microblaze/lib/ashrdi3.c
+++ b/arch/microblaze/lib/ashrdi3.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"
 
@@ -27,5 +27,4 @@ long long __ashrdi3(long long u, word_type b)
 
         return w.ll;
 }
-
 EXPORT_SYMBOL(__ashrdi3);
diff --git a/arch/microblaze/lib/cmpdi2.c b/arch/microblaze/lib/cmpdi2.c
index a708400ea7b7..67abc9ac1bd4 100644
--- a/arch/microblaze/lib/cmpdi2.c
+++ b/arch/microblaze/lib/cmpdi2.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"
 
diff --git a/arch/microblaze/lib/lshrdi3.c b/arch/microblaze/lib/lshrdi3.c
index dcf8d6810b7c..adcb253f11c8 100644
--- a/arch/microblaze/lib/lshrdi3.c
+++ b/arch/microblaze/lib/lshrdi3.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"
 
@@ -25,5 +25,4 @@ long long __lshrdi3(long long u, word_type b)
 
         return w.ll;
 }
-
 EXPORT_SYMBOL(__lshrdi3);
diff --git a/arch/microblaze/lib/memcpy.c b/arch/microblaze/lib/memcpy.c
index fe9c53fafdea..f536e81b8168 100644
--- a/arch/microblaze/lib/memcpy.c
+++ b/arch/microblaze/lib/memcpy.c
@@ -24,10 +24,10 @@
  * not any responsibility to update it.
  */
 
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/compiler.h>
-#include <linux/module.h>
 
 #include <linux/string.h>
 
@@ -103,12 +103,12 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
                         }
 #else
                         /* Load the holding buffer */
-                        buf_hold = (*i_src++ & 0xFFFFFF00) >>8;
+                        buf_hold = (*i_src++ & 0xFFFFFF00) >> 8;
 
                         for (; c >= 4; c -= 4) {
                                 value = *i_src++;
                                 *i_dst++ = buf_hold | ((value & 0xFF) << 24);
-                                buf_hold = (value & 0xFFFFFF00) >>8;
+                                buf_hold = (value & 0xFFFFFF00) >> 8;
                         }
 #endif
                         /* Realign the source */
@@ -129,12 +129,12 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
                         }
 #else
                         /* Load the holding buffer */
-                        buf_hold = (*i_src++ & 0xFFFF0000 )>>16;
+                        buf_hold = (*i_src++ & 0xFFFF0000) >> 16;
 
                         for (; c >= 4; c -= 4) {
                                 value = *i_src++;
-                                *i_dst++ = buf_hold | ((value & 0xFFFF)<<16);
-                                buf_hold = (value & 0xFFFF0000) >>16;
+                                *i_dst++ = buf_hold | ((value & 0xFFFF) << 16);
+                                buf_hold = (value & 0xFFFF0000) >> 16;
                         }
 #endif
                         /* Realign the source */
diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c
index 2146c3752a80..3611ce70415b 100644
--- a/arch/microblaze/lib/memmove.c
+++ b/arch/microblaze/lib/memmove.c
@@ -24,10 +24,10 @@
  * not any responsibility to update it.
  */
 
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/compiler.h>
-#include <linux/module.h>
 #include <linux/string.h>
 
 #ifdef __HAVE_ARCH_MEMMOVE
@@ -129,7 +129,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                         for (; c >= 4; c -= 4) {
                                 value = *--i_src;
-                                *--i_dst = buf_hold | ((value & 0xFFFFFF00)>>8);
+                                *--i_dst = buf_hold |
+                                                ((value & 0xFFFFFF00) >> 8);
                                 buf_hold = (value  & 0xFF) << 24;
                         }
 #endif
@@ -155,7 +156,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                         for (; c >= 4; c -= 4) {
                                 value = *--i_src;
-                                *--i_dst = buf_hold | ((value & 0xFFFF0000)>>16);
+                                *--i_dst = buf_hold |
+                                                ((value & 0xFFFF0000) >> 16);
                                 buf_hold = (value & 0xFFFF) << 16;
                         }
 #endif
@@ -181,7 +183,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
 
                         for (; c >= 4; c -= 4) {
                                 value = *--i_src;
-                                *--i_dst = buf_hold | ((value & 0xFF000000)>> 24);
+                                *--i_dst = buf_hold |
+                                                ((value & 0xFF000000) >> 24);
                                 buf_hold = (value & 0xFFFFFF) << 8;
                         }
 #endif
diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c
index ddf67939576d..04ea72c8a81d 100644
--- a/arch/microblaze/lib/memset.c
+++ b/arch/microblaze/lib/memset.c
@@ -24,10 +24,10 @@
  * not any responsibility to update it.
  */
 
+#include <linux/export.h>
 #include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/compiler.h>
-#include <linux/module.h>
 #include <linux/string.h>
 
 #ifdef __HAVE_ARCH_MEMSET
diff --git a/arch/microblaze/lib/muldi3.c b/arch/microblaze/lib/muldi3.c
index d3659244ab6f..a3f9a03acdcd 100644
--- a/arch/microblaze/lib/muldi3.c
+++ b/arch/microblaze/lib/muldi3.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"
 
diff --git a/arch/microblaze/lib/uaccess_old.S b/arch/microblaze/lib/uaccess_old.S
index f085995ee848..0e8cc2710c27 100644
--- a/arch/microblaze/lib/uaccess_old.S
+++ b/arch/microblaze/lib/uaccess_old.S
@@ -38,15 +38,14 @@ __strncpy_user:
         addik   r3,r7,0         /* temp_count = len */
 1:
         lbu     r4,r6,r0
+        beqid   r4,2f
         sb      r4,r5,r0
 
-        addik   r3,r3,-1
-        beqi    r3,2f           /* break on len */
-
         addik   r5,r5,1
-        bneid   r4,1b
         addik   r6,r6,1         /* delay slot */
-        addik   r3,r3,1         /* undo "temp_count--" */
+
+        addik   r3,r3,-1
+        bnei    r3,1b           /* break on len */
 2:
         rsubk   r3,r3,r7        /* temp_count = len - temp_count */
 3:
diff --git a/arch/microblaze/lib/ucmpdi2.c b/arch/microblaze/lib/ucmpdi2.c
index 63ca105b6713..d05f1585121c 100644
--- a/arch/microblaze/lib/ucmpdi2.c
+++ b/arch/microblaze/lib/ucmpdi2.c
@@ -1,4 +1,4 @@
-#include <linux/module.h>
+#include <linux/export.h>
 
 #include "libgcc.h"