Merge commit 'v3.0-rc5' into android-3.0

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / entry-armv.S

diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 90c62cd51ca9ffc891f7c95336b1c2017097d512..2cd00764016d78cb48f56954479f663fe1004936 100644 (file)
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -496,7 +496,7 @@ __und_usr:
        blo     __und_usr_unknown
 3:     ldrht   r0, [r4]
        add     r2, r2, #2                      @ r2 is PC + 2, make it PC + 4
-       orr     r0, r0, r5, lsl #16
+       orr     r0, r0, r5, lsl #16
 #else
        b       __und_usr_unknown
 #endif