projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kernel
/
suspend.c
diff --git
a/arch/arm64/kernel/suspend.c
b/arch/arm64/kernel/suspend.c
index
2b0887e
..
9135fe0
100644
(file)
--- 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