1 files changed, 8 insertions, 0 deletions

diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c
index 430344e2c989..1fa9ce4afd8f 100644
--- a/arch/arm64/kernel/suspend.c
+++ b/arch/arm64/kernel/suspend.c
@@ -1,3 +1,4 @@
+#include <linux/percpu.h>
 #include <linux/slab.h>
 #include <asm/cacheflush.h>
 #include <asm/cpu_ops.h>
@@ -89,6 +90,13 @@ int cpu_suspend(unsigned long arg)
         if (ret == 0) {
                 cpu_switch_mm(mm->pgd, mm);
                 flush_tlb_all();
+
+                /*
+                 * Restore per-cpu offset before any kernel
+                 * subsystem relying on it has a chance to run.
+                 */
+                set_my_cpu_offset(per_cpu_offset(cpu));
+
                 /*
                  * Restore HW breakpoint registers to sane values
                  * before debug exceptions are possibly reenabled