4 files changed, 14 insertions, 8 deletions

diff --git a/arch/microblaze/lib/Makefile b/arch/microblaze/lib/Makefile
index f1fcbff3da25..10c320aa908b 100644
--- a/arch/microblaze/lib/Makefile
+++ b/arch/microblaze/lib/Makefile
@@ -2,6 +2,12 @@
 # Makefile
 #
 
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_ashldi3.o = -pg
+CFLAGS_REMOVE_ashrdi3.o = -pg
+CFLAGS_REMOVE_lshrdi3.o = -pg
+endif
+
 lib-y :=  memset.o
 
 ifeq ($(CONFIG_OPT_LIB_ASM),y)
diff --git a/arch/microblaze/lib/memcpy.c b/arch/microblaze/lib/memcpy.c
index cc495d7d99cc..52746e718dfa 100644
--- a/arch/microblaze/lib/memcpy.c
+++ b/arch/microblaze/lib/memcpy.c
@@ -63,8 +63,8 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
         if (likely(c >= 4)) {
                 unsigned  value, buf_hold;
 
-                /* Align the dstination to a word boundry. */
-                /* This is done in an endian independant manner. */
+                /* Align the destination to a word boundary. */
+                /* This is done in an endian independent manner. */
                 switch ((unsigned long)dst & 3) {
                 case 1:
                         *dst++ = *src++;
@@ -80,7 +80,7 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
                 i_dst = (void *)dst;
 
                 /* Choose a copy scheme based on the source */
-                /* alignment relative to dstination. */
+                /* alignment relative to destination. */
                 switch ((unsigned long)src & 3) {
                 case 0x0:       /* Both byte offsets are aligned */
                         i_src  = (const void *)src;
@@ -173,7 +173,7 @@ void *memcpy(void *v_dst, const void *v_src, __kernel_size_t c)
         }
 
         /* Finish off any remaining bytes */
-        /* simple fast copy, ... unless a cache boundry is crossed */
+        /* simple fast copy, ... unless a cache boundary is crossed */
         switch (c) {
         case 3:
                 *dst++ = *src++;
diff --git a/arch/microblaze/lib/memmove.c b/arch/microblaze/lib/memmove.c
index 810fd68775e3..2146c3752a80 100644
--- a/arch/microblaze/lib/memmove.c
+++ b/arch/microblaze/lib/memmove.c
@@ -83,8 +83,8 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
         if (c >= 4) {
                 unsigned  value, buf_hold;
 
-                /* Align the destination to a word boundry. */
-                /* This is done in an endian independant manner. */
+                /* Align the destination to a word boundary. */
+                /* This is done in an endian independent manner. */
 
                 switch ((unsigned long)dst & 3) {
                 case 3:
@@ -193,7 +193,7 @@ void *memmove(void *v_dst, const void *v_src, __kernel_size_t c)
                 dst = (void *)i_dst;
         }
 
-        /* simple fast copy, ... unless a cache boundry is crossed */
+        /* simple fast copy, ... unless a cache boundary is crossed */
         /* Finish off any remaining bytes */
         switch (c) {
         case 4:
diff --git a/arch/microblaze/lib/memset.c b/arch/microblaze/lib/memset.c
index 834565d1607e..ddf67939576d 100644
--- a/arch/microblaze/lib/memset.c
+++ b/arch/microblaze/lib/memset.c
@@ -64,7 +64,7 @@ void *memset(void *v_src, int c, __kernel_size_t n)
 
         if (likely(n >= 4)) {
                 /* Align the destination to a word boundary */
-                /* This is done in an endian independant manner */
+                /* This is done in an endian independent manner */
                 switch ((unsigned) src & 3) {
                 case 1:
                         *src++ = c;