Not a functional change Signed-off-by: Alejandro Vallejo <agarc...@amd.com> --- v2: * Remove both links rather than just one. --- xen/arch/arm/include/asm/grant_table.h | 1 - xen/common/device-tree/dom0less-build.c | 1 + xen/common/grant_table.c | 2 ++ xen/include/xen/grant_table.h | 4 ---- 4 files changed, 3 insertions(+), 5 deletions(-)
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/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 3d503c6973..d5bb1d5d35 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -26,6 +26,7 @@ #include <public/io/xs_wire.h> #include <asm/dom0less-build.h> +#include <asm/grant_table.h> #include <asm/setup.h> #include <xen/static-memory.h> diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index cf131c43a1..1e437eff50 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -42,8 +42,10 @@ #include <xen/xvmalloc.h> #include <xen/nospec.h> #include <xsm/xsm.h> + #include <asm/flushtlb.h> #include <asm/guest_atomics.h> +#include <asm/grant_table.h> #ifdef CONFIG_PV_SHIM #include <asm/guest.h> diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 297d7669e9..98c4f4136b 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -27,10 +27,6 @@ #include <xen/rwlock.h> #include <public/grant_table.h> -#ifdef CONFIG_GRANT_TABLE -#include <asm/grant_table.h> -#endif - struct grant_table; /* Seed a gnttab entry for Hyperlaunch/dom0less. */ -- 2.43.0
