diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2017-01-24 06:43:40 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-01-26 07:14:50 -0500 |
| commit | cbb999dd0b452991f4f698142aa7ffe566c0b415 (patch) | |
| tree | 63600d9710ce372e479ac22ebb9417fc5265d7d3 | |
| parent | 4a8d8a14c0d08c2437cb80c05e88f6cc1ca3fb2c (diff) | |
arm64: Use __pa_symbol for empty_zero_page
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>
| -rw-r--r-- | arch/arm64/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 669fc9ff728b..b5222094ab52 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
| @@ -298,7 +298,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 298 | * faults in case uaccess_enable() is inadvertently called by the init | 298 | * faults in case uaccess_enable() is inadvertently called by the init |
| 299 | * thread. | 299 | * thread. |
| 300 | */ | 300 | */ |
| 301 | init_task.thread_info.ttbr0 = virt_to_phys(empty_zero_page); | 301 | init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page); |
| 302 | #endif | 302 | #endif |
| 303 | 303 | ||
| 304 | #ifdef CONFIG_VT | 304 | #ifdef CONFIG_VT |