Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a061928 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Russell King
Browse files

ARM: 8291/1: replace magic number with PAGE_SHIFT macro in fixup_pv code 



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: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7d57909b

arch/arm/kernel/head.S

+1 −1
Original line number Diff line number Diff line
@@ -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