From: Juergen Gross <jgross@suse.com>
Date: Thu, 9 Apr 2020 07:00:01 +0000 (+0200)
Subject: x86/xen: fix booting 32-bit pv guest
X-Git-Tag: v5.4.196~4
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=a12884ff43400e94b109bf4aa9fa5eed47ef5241;p=wrapfs-5.4.y.git

x86/xen: fix booting 32-bit pv guest

commit d6f34f4c6b4a962eb7a86c923fea206f866a40be upstream.

Commit 2f62f36e62daec ("x86/xen: Make the boot CPU idle task reliable")
introduced a regression for booting 32 bit Xen PV guests: the address
of the initial stack needs to be a virtual one.

Fixes: 2f62f36e62daec ("x86/xen: Make the boot CPU idle task reliable")
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20200409070001.16675-1-jgross@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 591544b4b85a..142da8547480 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -38,7 +38,7 @@ ENTRY(startup_xen)
 #ifdef CONFIG_X86_64
 	mov initial_stack(%rip), %rsp
 #else
-	mov pa(initial_stack), %esp
+	mov initial_stack, %esp
 #endif
 
 #ifdef CONFIG_X86_64