Commit 875988cc authored Jan 24, 2017 by Geert Uytterhoeven Committed by Mark Salyzyn Nov 20, 2017

BACKPORT: arm64: Use __pa_symbol for empty_zero_page



(cherry-pick commit from cbb999dd0b452991f4f698142aa7ffe566c0b415)

If CONFIG_DEBUG_VIRTUAL=y and CONFIG_ARM64_SW_TTBR0_PAN=y:

    virt_to_phys used for non-linear address: ffffff8008cc0000 (empty_zero_page+0x0/0x1000)
    WARNING: CPU: 0 PID: 0 at arch/arm64/mm/physaddr.c:14 __virt_to_phys+0x28/0x60
    ...
    [<ffffff800809abb4>] __virt_to_phys+0x28/0x60
    [<ffffff8008a02600>] setup_arch+0x46c/0x4d4

Fixes: 2077be6783b5936c ("arm64: Use __pa_symbol for kernel symbols")
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Bug: 20045882
Bug: 63737556
Change-Id: Ida933e532d0423e074b3621207a1e2a5f8609742

parent 427c5675

arch/arm64/kernel/setup.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -355,9 +355,9 @@ void __init setup_arch(char **cmdline_p)
		* thread.
		*/
		#ifdef CONFIG_THREAD_INFO_IN_TASK
		init_task.thread_info.ttbr0 = virt_to_phys(empty_zero_page);
		init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);
		#else
		init_thread_info.ttbr0 = virt_to_phys(empty_zero_page);
		init_thread_info.ttbr0 = __pa_symbol(empty_zero_page);
		#endif
		#endif