xen/grant_table is meant to pull asm/grant_table, when it exists.
Signed-off-by: Alejandro Vallejo <agarc...@amd.com>
---
xen/arch/arm/domain_build.c | 1 -
xen/arch/arm/include/asm/grant_table.h | 1 -
xen/include/xen/grant_table.h | 2 +-
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index b189a7cfae..11cc03e5db 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -37,7 +37,6 @@
#include <xen/irq.h>
#include <xen/grant_table.h>
-#include <asm/grant_table.h>
#include <xen/serial.h>
static unsigned int __initdata opt_dom0_max_vcpus;
diff --git a/xen/arch/arm/include/asm/grant_table.h
b/xen/arch/arm/include/asm/grant_table.h
index c5d87b60c4..c47058a3a0 100644
--- a/xen/arch/arm/include/asm/grant_table.h
+++ b/xen/arch/arm/include/asm/grant_table.h
@@ -1,7 +1,6 @@
#ifndef __ASM_GRANT_TABLE_H__
#define __ASM_GRANT_TABLE_H__
-#include <xen/grant_table.h>
#include <xen/kernel.h>
#include <xen/pfn.h>
#include <xen/sched.h>
diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h
index 297d7669e9..491cd6c539 100644
--- a/xen/include/xen/grant_table.h
+++ b/xen/include/xen/grant_table.h
@@ -27,7 +27,7 @@
#include <xen/rwlock.h>
#include <public/grant_table.h>
-#ifdef CONFIG_GRANT_TABLE
+#if __has_include("asm/grant_table.h")
#include <asm/grant_table.h>
#endif
--
2.43.0
