Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arm64
/
kernel
/
suspend.c
diff --git
a/kernel/arch/arm64/kernel/suspend.c
b/kernel/arch/arm64/kernel/suspend.c
index
1095aa4
..
00c1372
100644
(file)
--- a/
kernel/arch/arm64/kernel/suspend.c
+++ b/
kernel/arch/arm64/kernel/suspend.c
@@
-1,7
+1,9
@@
#include <linux/ftrace.h>
#include <linux/percpu.h>
#include <linux/slab.h>
#include <linux/ftrace.h>
#include <linux/percpu.h>
#include <linux/slab.h>
+#include <asm/alternative.h>
#include <asm/cacheflush.h>
#include <asm/cacheflush.h>
+#include <asm/cpufeature.h>
#include <asm/debug-monitors.h>
#include <asm/pgtable.h>
#include <asm/memory.h>
#include <asm/debug-monitors.h>
#include <asm/pgtable.h>
#include <asm/memory.h>
@@
-110,6
+112,13
@@
int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
*/
set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
*/
set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
+ /*
+ * PSTATE was not saved over suspend/resume, re-enable any
+ * detected features that might not have been set correctly.
+ */
+ asm(ALTERNATIVE("nop", SET_PSTATE_PAN(1), ARM64_HAS_PAN,
+ CONFIG_ARM64_PAN));
+
/*
* Restore HW breakpoint registers to sane values
* before debug exceptions are possibly reenabled
/*
* Restore HW breakpoint registers to sane values
* before debug exceptions are possibly reenabled