From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 30 Oct 2020 13:30:35 +0000 (+0100)
Subject: x86: fix build of PV shim when !GRANT_TABLE
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1443
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b1b4f9598b021c7a9dc6b33eb55bc3e5912614f6;p=xen.git

x86: fix build of PV shim when !GRANT_TABLE

To do its compat translation, shim code needs to include the compat
header. For this to work, this header first of all needs to be
generated.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/include/Makefile b/xen/include/Makefile
index 5c2f57a0f6..75e982a316 100644
--- a/xen/include/Makefile
+++ b/xen/include/Makefile
@@ -24,6 +24,7 @@ headers-$(CONFIG_X86)     += compat/arch-x86/xen-$(compat-arch-y).h
 headers-$(CONFIG_ARGO)    += compat/argo.h
 headers-$(CONFIG_PV)      += compat/callback.h
 headers-$(CONFIG_GRANT_TABLE) += compat/grant_table.h
+headers-$(CONFIG_PV_SHIM) += compat/grant_table.h
 headers-$(CONFIG_HVM)     += compat/hvm/dm_op.h
 headers-$(CONFIG_HVM)     += compat/hvm/hvm_op.h
 headers-$(CONFIG_HVM)     += compat/hvm/hvm_vcpu.h