diff options
author | Will Deacon <will@kernel.org> | 2021-02-12 15:07:34 +0000 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2021-02-12 15:07:34 +0000 |
commit | 1d32854ea76331d10d376ed3ac67831b94466ae9 (patch) | |
tree | 042e0b579b4e9e98ba926b3c6e495596c30cb138 /arch/arm64/include/asm/memory.h | |
parent | b374d0f981a79303d6079d7210c04af304fc6b9d (diff) | |
parent | e9c6deee00e9197e75cd6aa0d265d3d45bd7cc28 (diff) | |
download | lwn-1d32854ea76331d10d376ed3ac67831b94466ae9.tar.gz lwn-1d32854ea76331d10d376ed3ac67831b94466ae9.zip |
Merge branch 'for-next/misc' into for-next/core
Miscellaneous arm64 changes for 5.12.
* for-next/misc:
arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+
arm64: vmlinux.ld.S: add assertion for tramp_pg_dir offset
arm64: vmlinux.ld.S: add assertion for reserved_pg_dir offset
arm64/ptdump:display the Linear Mapping start marker
arm64: ptrace: Fix missing return in hw breakpoint code
KVM: arm64: Move __hyp_set_vectors out of .hyp.text
arm64: Include linux/io.h in mm/mmap.c
arm64: cacheflush: Remove stale comment
arm64: mm: Remove unused header file
arm64/sparsemem: reduce SECTION_SIZE_BITS
arm64/mm: Add warning for outside range requests in vmemmap_populate()
arm64: Drop workaround for broken 'S' constraint with GCC 4.9
Diffstat (limited to 'arch/arm64/include/asm/memory.h')
-rw-r--r-- | arch/arm64/include/asm/memory.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 18fce223b67b..6c2674937665 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -159,6 +159,18 @@ #define IOREMAP_MAX_ORDER (PMD_SHIFT) #endif +/* + * Open-coded (swapper_pg_dir - reserved_pg_dir) as this cannot be calculated + * until link time. + */ +#define RESERVED_SWAPPER_OFFSET (PAGE_SIZE) + +/* + * Open-coded (swapper_pg_dir - tramp_pg_dir) as this cannot be calculated + * until link time. + */ +#define TRAMP_SWAPPER_OFFSET (2 * PAGE_SIZE) + #ifndef __ASSEMBLY__ #include <linux/bitops.h> |