[xen master] x86/guest: fix build when HVM and !PV32

[patchbot@xxxxxxx]

commit 3673e9ba77bb71a36e9917bf1e487c40dc425c92
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Wed May 26 09:33:02 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Wed May 26 09:33:02 2021 +0200

    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@xxxxxxxx>
    Acked-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/pv/shim.c | 1 +
 1 file changed, 1 insertion(+)

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
 
--
generated by git-patchbot for /home/xen/git/xen.git#master