Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / mm / pv-fixup-asm.S

diff --git a/arch/arm/mm/pv-fixup-asm.S b/arch/arm/mm/pv-fixup-asm.S
index 8eade04..5c5e195 100644 (file)
--- a/arch/arm/mm/pv-fixup-asm.S
+++ b/arch/arm/mm/pv-fixup-asm.S
@@ -39,8 +39,8 @@ ENTRY(lpae_pgtables_remap_asm)
 
        /* Update level 2 entries for the boot data */
        add     r7, r2, #0x1000
-       add     r7, r7, r3, lsr #SECTION_SHIFT - L2_ORDER
-       bic     r7, r7, #(1 << L2_ORDER) - 1
+       movw    r3, #FDT_FIXED_BASE >> (SECTION_SHIFT - L2_ORDER)
+       add     r7, r7, r3
        ldrd    r4, r5, [r7]
        adds    r4, r4, r0
        adc     r5, r5, r1