From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 28 May 2018 09:20:26 +0000 (+0200)
Subject: x86/XPTI: fix S3 resume (and CPU offlining in general)
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~82
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6b9562dac1746014ab376bd2cf8ba400acf34c6d;p=xen.git

x86/XPTI: fix S3 resume (and CPU offlining in general)

We should index an L1 table with an L1 index.

Reported-by: Simon Gaiser <simon@invisiblethingslab.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
---

diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index fd9050e0f6..d4478e6132 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -883,7 +883,7 @@ static void cleanup_cpu_root_pgt(unsigned int cpu)
         l2_pgentry_t *l2t = l3e_to_l2e(l3t[l3_table_offset(stub_linear)]);
         l1_pgentry_t *l1t = l2e_to_l1e(l2t[l2_table_offset(stub_linear)]);
 
-        l1t[l2_table_offset(stub_linear)] = l1e_empty();
+        l1t[l1_table_offset(stub_linear)] = l1e_empty();
     }
 }