[xen master] xen: ifdef inclusion of <asm/grant_table.h> in <xen/grant_table.h>

[patchbot@xxxxxxx]

commit 589d8cf146290bdc7f4347bced10c20bd14791f6
Author:     Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
AuthorDate: Wed Dec 20 16:08:29 2023 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jan 8 10:15:44 2024 +0100

    xen: ifdef inclusion of <asm/grant_table.h> in <xen/grant_table.h>
    
    Ifdef-ing inclusion of <asm/grant_table.h> allows to avoid
    generation of empty <asm/grant_table.h> for cases when
    CONFIG_GRANT_TABLE is not enabled.
    
    The following changes were done for Arm:
    <asm/grant_table.h> should be included directly because it contains
    gnttab_dom0_frames() macros which is unique for Arm and is used in
    arch/arm/domain_build.c.
    <asm/grant_table.h> is #ifdef-ed with CONFIG_GRANT_TABLE in
    <xen/grant_table.h> so in case of !CONFIG_GRANT_TABLE gnttab_dom0_frames
    won't be available for use in arch/arm/domain_build.c.
    
    Suggested-by: Jan Beulich <jbeulich@xxxxxxxx>
    Signed-off-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
    Acked-by: Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx>
---
 xen/arch/arm/domain_build.c            | 1 +
 xen/arch/ppc/include/asm/grant_table.h | 5 -----
 xen/include/xen/grant_table.h          | 3 +++
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 6945b9755d..46161848dc 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -36,6 +36,7 @@
 
 #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/ppc/include/asm/grant_table.h 
b/xen/arch/ppc/include/asm/grant_table.h
deleted file mode 100644
index d0ff58dd3d..0000000000
--- a/xen/arch/ppc/include/asm/grant_table.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef __ASM_PPC_GRANT_TABLE_H__
-#define __ASM_PPC_GRANT_TABLE_H__
-
-#endif /* __ASM_PPC_GRANT_TABLE_H__ */
diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h
index 85fe6b7b5e..50edfecfb6 100644
--- a/xen/include/xen/grant_table.h
+++ b/xen/include/xen/grant_table.h
@@ -26,7 +26,10 @@
 #include <xen/mm-frame.h>
 #include <xen/rwlock.h>
 #include <public/grant_table.h>
+
+#ifdef CONFIG_GRANT_TABLE
 #include <asm/grant_table.h>
+#endif
 
 struct grant_table;
 
--
generated by git-patchbot for /home/xen/git/xen.git#master