[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/19] arm/gnttab: Break cycle between asm/grant_table.h and xen/grant_table.h
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Alejandro Vallejo <agarciav@xxxxxxx>
- Date: Fri, 30 May 2025 14:02:15 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=F1Gy7METHvl4e1uTjxJqux8z1qxe5mj2zTQSv1Qz68k=; b=N1Ri+yY7/uYypJYSLJ0aD76q0Z8Ri/QsFa0oEFEzf3JMaasncxZy1gLes86Fo+awHr2OefwuRmyELcvDxS5WVelMMFp93Uho3TdYLbvGkWerNn11QF2CooEGoBuoPyaDfkjPEphbU4hQhGsqEhNH7vmWofAvLllpPI0Q+BsreaCJi9qOjGvFRRR3ZZenKjGNk+qBzaaLXrkIXy9wv9bucF3Y+JpkodroI5Nfvluq4M/XRWcypG3V2nbMso136vzFAY9krj//SyC0ltA9FBKd25Zuj+dbmgD9HI2CVVxAY6v+c2lcvjDJ6fqNyXuNDQmCWYyUChavrypsgAd0BRQ+6A==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=spQ+SFUEjc/XLWnGN7A/NOVBa+tWMrXV56fdBhrRmN2Nb7mfPEUieYyz8mqUJwefoT0Gq8eegDRWZToVAa27krpMdphCFj1+jAboefYgqYhh4ViGLR9XWRbebPOoI3C2X41rwPmP0XiQsjH/LN4ghmi2zaHtvicC9DFP1VeZYWg7MrYHt6ru2nHwYTAqBbmZ2uPejr8d0JvSenGwsw7y8OLjx5VG3kSrut5RSvO3O8ExNicQhZg94Yi0Ft/q3VJ7f/vpKrzC4Ll+OyDzaJk+0HLuqlL65qmwc1KYEOZnhdzwfRh7Xf1G+9ylBVGUuksy4ZgxTyhVun+7MhBe3XBytg==
- Cc: Alejandro Vallejo <agarciav@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Bertrand Marquis <bertrand.marquis@xxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, "Volodymyr Babchuk" <Volodymyr_Babchuk@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, "Jan Beulich" <jbeulich@xxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>
- Delivery-date: Fri, 30 May 2025 12:03:29 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
xen/grant_table is meant to pull asm/grant_table, when it exists.
Signed-off-by: Alejandro Vallejo <agarciav@xxxxxxx>
---
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
|
