2 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index f35d91fbe117..b8c14e936697 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -34,7 +34,7 @@
         and     r2, r0, #7
         mov     r3, #1
         mov     r3, r3, lsl r2
-        save_and_disable_irqs ip, r2
+        save_and_disable_irqs ip
         ldrb    r2, [r1, r0, lsr #3]
         \instr  r2, r2, r3
         strb    r2, [r1, r0, lsr #3]
@@ -54,7 +54,7 @@
         add     r1, r1, r0, lsr #3
         and     r3, r0, #7
         mov     r0, #1
-        save_and_disable_irqs ip, r2
+        save_and_disable_irqs ip
         ldrb    r2, [r1]
         tst     r2, r0, lsl r3
         \instr  r2, r2, r0, lsl r3
diff --git a/arch/arm/lib/csumpartial.S b/arch/arm/lib/csumpartial.S
index cb5e3708f118..fe797cf320bb 100644
--- a/arch/arm/lib/csumpartial.S
+++ b/arch/arm/lib/csumpartial.S
@@ -39,6 +39,7 @@ td3	.req	lr
 
                 /* we must have at least one byte. */
                 tst     buf, #1                 @ odd address?
+                movne   sum, sum, ror #8
                 ldrneb  td0, [buf], #1
                 subne   len, len, #1
                 adcnes  sum, sum, td0, put_byte_1
@@ -103,6 +104,9 @@ ENTRY(csum_partial)
                 cmp     len, #8                 @ Ensure that we have at least
                 blo     .less8                  @ 8 bytes to copy.
 
+                tst     buf, #1
+                movne   sum, sum, ror #8
+
                 adds    sum, sum, #0            @ C = 0
                 tst     buf, #3                 @ Test destination alignment
                 blne    .not_aligned            @ aligh destination, return here