ARM: 8291/1: replace magic number with PAGE_SHIFT macro in fixup_pv code
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Tue, 20 Jan 2015 02:49:35 +0000 (03:49 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jan 2015 15:59:57 +0000 (15:59 +0000)
This line converts PHYS_OFFSET into PHYS_PFN_OFFSET.
It is better to use PAGE_SHIFT rather than the magic number 12.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/head.S

index 664eee8c4a26ce5998e72a3b1e70ffe8bfa2d8f3..ecb7be8b0854987a7b6b6072a39b323b3228212d 100644 (file)
@@ -586,7 +586,7 @@ __fixup_pv_table:
        add     r5, r5, r3      @ adjust table end address
        add     r6, r6, r3      @ adjust __pv_phys_pfn_offset address
        add     r7, r7, r3      @ adjust __pv_offset address
-       mov     r0, r8, lsr #12 @ convert to PFN
+       mov     r0, r8, lsr #PAGE_SHIFT @ convert to PFN
        str     r0, [r6]        @ save computed PHYS_OFFSET to __pv_phys_pfn_offset
        strcc   ip, [r7, #HIGH_OFFSET]  @ save to __pv_offset high bits
        mov     r6, r3, lsr #24 @ constant for add/sub instructions