Merge tag 'vfio-for-v3.10' of git://github.com/awilliam/linux-vfio

[~andy/linux] / arch / arm / lib / muldi3.S

diff --git a/arch/arm/lib/muldi3.S b/arch/arm/lib/muldi3.S
index c7fbdf005319ebda1060f1f891e32c50b88c831f..36c91b4957e2da0d9bdc006bcf3644dbab001d72 100644 (file)
--- a/arch/arm/lib/muldi3.S
+++ b/arch/arm/lib/muldi3.S
@@ -25,11 +25,12 @@
 #endif
 
 ENTRY(__muldi3)
+ENTRY(__aeabi_lmul)
 
        mul     xh, yl, xh
        mla     xh, xl, yh, xh
-       mov     ip, xl, asr #16
-       mov     yh, yl, asr #16
+       mov     ip, xl, lsr #16
+       mov     yh, yl, lsr #16
        bic     xl, xl, ip, lsl #16
        bic     yl, yl, yh, lsl #16
        mla     xh, yh, ip, xh
@@ -42,3 +43,5 @@ ENTRY(__muldi3)
        adc     xh, xh, ip, lsr #16
        mov     pc, lr
 
+ENDPROC(__muldi3)
+ENDPROC(__aeabi_lmul)