diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2020-12-09 18:04:48 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2020-12-09 18:04:48 +0000 |
| commit | ba4259a6f87a4d7b5039673569db06b6d8b74cf3 (patch) | |
| tree | ca880ae0a2f555ee49b572c97703ad6a9da9fcff /arch/arm64/include/asm/pgtable.h | |
| parent | e0f7a8d5e87f31da15a80fcf038f6296bae26f38 (diff) | |
| parent | 344f2db2a18af45faafce13133c84c4f076876a6 (diff) | |
| download | linux-ba4259a6f87a4d7b5039673569db06b6d8b74cf3.tar.bz2 | |
Merge branch 'for-next/misc' into for-next/core
* for-next/misc:
: Miscellaneous patches
arm64: vmlinux.lds.S: Drop redundant *.init.rodata.*
kasan: arm64: set TCR_EL1.TBID1 when enabled
arm64: mte: optimize asynchronous tag check fault flag check
arm64/mm: add fallback option to allocate virtually contiguous memory
arm64/smp: Drop the macro S(x,s)
arm64: consistently use reserved_pg_dir
arm64: kprobes: Remove redundant kprobe_step_ctx
# Conflicts:
# arch/arm64/kernel/vmlinux.lds.S
Diffstat (limited to 'arch/arm64/include/asm/pgtable.h')
| -rw-r--r-- | arch/arm64/include/asm/pgtable.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index ec307b8bcb15..b35833259f08 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -519,6 +519,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; extern pgd_t idmap_pg_end[]; extern pgd_t tramp_pg_dir[PTRS_PER_PGD]; +extern pgd_t reserved_pg_dir[PTRS_PER_PGD]; extern void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd); |