diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2022-06-24 18:06:40 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-06-24 19:18:10 +0300 |
| commit | 1682c45b920643cbde31d8a5b7ca7c2be92d6928 (patch) | |
| tree | f0d89108446f8450763a349a5d5a4c83f9457dbe /arch/arm64/kernel/suspend.c | |
| parent | 723d3a8ed1726081ca40f602073c53de28eebb93 (diff) | |
| download | linux-1682c45b920643cbde31d8a5b7ca7c2be92d6928.tar.xz | |
arm64: mm: provide idmap pointer to cpu_replace_ttbr1()
In preparation for changing the way we initialize the permanent ID map,
update cpu_replace_ttbr1() so we can use it with the initial ID map as
well.
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20220624150651.1358849-11-ardb@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/suspend.c')
| -rw-r--r-- | arch/arm64/kernel/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c index 2b0887e58a7c..9135fe0f3df5 100644 --- a/arch/arm64/kernel/suspend.c +++ b/arch/arm64/kernel/suspend.c @@ -52,7 +52,7 @@ void notrace __cpu_suspend_exit(void) /* Restore CnP bit in TTBR1_EL1 */ if (system_supports_cnp()) - cpu_replace_ttbr1(lm_alias(swapper_pg_dir)); + cpu_replace_ttbr1(lm_alias(swapper_pg_dir), idmap_pg_dir); /* * PSTATE was not saved over suspend/resume, re-enable any detected |