diff options
| author | Joey Gouly <joey.gouly@arm.com> | 2021-02-02 12:36:58 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-03 20:43:45 +0000 |
| commit | 0188a894c390e51475274ece76b4d601782d709e (patch) | |
| tree | 79cf592206f63eed00a6b74f88f573ce836cd627 /arch/arm64/kernel/vmlinux.lds.S | |
| parent | 00ef543419366e8b742435992d08e0d5a87fd561 (diff) | |
| download | linux-0188a894c390e51475274ece76b4d601782d709e.tar.gz linux-0188a894c390e51475274ece76b4d601782d709e.tar.bz2 linux-0188a894c390e51475274ece76b4d601782d709e.zip | |
arm64: vmlinux.ld.S: add assertion for tramp_pg_dir offset
Add TRAMP_SWAPPER_OFFSET and use that instead of hardcoding
the offset between swapper_pg_dir and tramp_pg_dir.
Then use TRAMP_SWAPPER_OFFSET to assert that the offset is
correct at link time.
Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20210202123658.22308-3-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/arm64/kernel/vmlinux.lds.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index a03a5300bce9..68f76a96c60b 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -319,3 +319,8 @@ ASSERT(_text == KIMAGE_VADDR, "HEAD is misaligned") ASSERT(swapper_pg_dir - reserved_pg_dir == RESERVED_SWAPPER_OFFSET, "RESERVED_SWAPPER_OFFSET is wrong!") + +#ifdef CONFIG_UNMAP_KERNEL_AT_EL0 +ASSERT(swapper_pg_dir - tramp_pg_dir == TRAMP_SWAPPER_OFFSET, + "TRAMP_SWAPPER_OFFSET is wrong!") +#endif |