From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 26 May 2021 07:33:02 +0000 (+0200)
Subject: x86/guest: fix build when HVM and !PV32
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~500
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3673e9ba77bb71a36e9917bf1e487c40dc425c92;p=xen.git

x86/guest: fix build when HVM and !PV32

The commit referenced below still wasn't careful enough - with COMPAT we
will have a compat_handle_okay() visible already, which we first need to
get rid of.

Fixes: bd1e7b47bac0 ("x86/shim: fix build when !PV32")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
---

diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index 8164a0fbde..d9704121a7 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -679,6 +679,7 @@ void pv_shim_inject_evtchn(unsigned int port)
 # include <compat/grant_table.h>
 #else
 # define compat_gnttab_setup_table gnttab_setup_table
+# undef compat_handle_okay
 # define compat_handle_okay guest_handle_okay
 #endif