ARM: 9012/1: move device tree mapping out of linear region

[linux-2.6-microblaze.git] / arch / arm / kernel / head.S

diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index f890422..9b18d8c 100644 (file)
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -275,9 +275,8 @@ __create_page_tables:
         */
        mov     r0, r2, lsr #SECTION_SHIFT
        movs    r0, r0, lsl #SECTION_SHIFT
-       subne   r3, r0, r8
-       addne   r3, r3, #PAGE_OFFSET
-       addne   r3, r4, r3, lsr #(SECTION_SHIFT - PMD_ORDER)
+       ldrne   r3, =FDT_FIXED_BASE >> (SECTION_SHIFT - PMD_ORDER)
+       addne   r3, r3, r4
        orrne   r6, r7, r0
        strne   r6, [r3], #1 << PMD_ORDER
        addne   r6, r6, #1 << SECTION_SHIFT