3 files changed, 19 insertions, 14 deletions

diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index ffb19b7da999..ff3c10721caf 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -130,7 +130,7 @@ csum_partial_cfu_aligned(const unsigned long __user *src, unsigned long *dst,
                 *dst = word | tmp;
                 checksum += carry;
         }
-        if (err) *errp = err;
+        if (err && errp) *errp = err;
         return checksum;
 }
 
@@ -185,7 +185,7 @@ csum_partial_cfu_dest_aligned(const unsigned long __user *src,
                 *dst = word | tmp;
                 checksum += carry;
         }
-        if (err) *errp = err;
+        if (err && errp) *errp = err;
         return checksum;
 }
 
@@ -242,7 +242,7 @@ csum_partial_cfu_src_aligned(const unsigned long __user *src,
         stq_u(partial_dest | second_dest, dst);
 out:
         checksum += carry;
-        if (err) *errp = err;
+        if (err && errp) *errp = err;
         return checksum;
 }
 
@@ -325,7 +325,7 @@ csum_partial_cfu_unaligned(const unsigned long __user * src,
                 stq_u(partial_dest | word | second_dest, dst);
                 checksum += carry;
         }
-        if (err) *errp = err;
+        if (err && errp) *errp = err;
         return checksum;
 }
 
@@ -339,7 +339,7 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
 
         if (len) {
                 if (!access_ok(VERIFY_READ, src, len)) {
-                        *errp = -EFAULT;
+                        if (errp) *errp = -EFAULT;
                         memset(dst, 0, len);
                         return sum;
                 }
diff --git a/arch/alpha/lib/ev6-memset.S b/arch/alpha/lib/ev6-memset.S
index d8b94e1c7fca..356bb2fdd705 100644
--- a/arch/alpha/lib/ev6-memset.S
+++ b/arch/alpha/lib/ev6-memset.S
@@ -30,14 +30,15 @@
         .set noat
         .set noreorder
 .text
+        .globl memset
         .globl __memset
+        .globl ___memset
         .globl __memsetw
         .globl __constant_c_memset
-        .globl memset
 
-        .ent __memset
+        .ent ___memset
 .align 5
-__memset:
+___memset:
         .frame $30,0,$26,0
         .prologue 0
 
@@ -227,7 +228,7 @@ end_b:
         nop
         nop
         ret $31,($26),1         # L0 :
-        .end __memset
+        .end ___memset
 
         /*
          * This is the original body of code, prior to replication and
@@ -594,4 +595,5 @@ end_w:
 
         .end __memsetw
 
-memset = __memset
+memset = ___memset
+__memset = ___memset
diff --git a/arch/alpha/lib/memset.S b/arch/alpha/lib/memset.S
index 311b8cfc6914..76ccc6d1f364 100644
--- a/arch/alpha/lib/memset.S
+++ b/arch/alpha/lib/memset.S
@@ -19,11 +19,13 @@
 .text
         .globl memset
         .globl __memset
+        .globl ___memset
         .globl __memsetw
         .globl __constant_c_memset
-        .ent __memset
+
+        .ent ___memset
 .align 5
-__memset:
+___memset:
         .frame $30,0,$26,0
         .prologue 0
 
@@ -103,7 +105,7 @@ within_one_quad:
 
 end:
         ret $31,($26),1         /* E1 */
-        .end __memset
+        .end ___memset
 
         .align 5
         .ent __memsetw
@@ -121,4 +123,5 @@ __memsetw:
 
         .end __memsetw
 
-memset = __memset
+memset = ___memset
+__memset = ___memset