Move the creation of the hypervisor node to a later stage to avoid
potential dependency issues.
No functional change.
Signed-off-by: Koichiro Den <d...@valinux.co.jp>
---
xen/arch/arm/domain_build.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 42210c702ab8..5fbc26f70988 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1728,14 +1728,6 @@ static int __init handle_node(struct domain *d, struct
kernel_info *kinfo,
*/
evtchn_allocate(d);
- /*
- * The hypervisor node should always be created after all nodes
- * from the host DT have been parsed.
- */
- res = make_hypervisor_node(d, kinfo, addrcells, sizecells);
- if ( res )
- return res;
-
res = make_psci_node(kinfo->fdt);
if ( res )
return res;
@@ -1766,6 +1758,14 @@ static int __init handle_node(struct domain *d, struct
kernel_info *kinfo,
if ( res )
return res;
}
+
+ /*
+ * The hypervisor node should always be created after all nodes
+ * from the host DT have been parsed.
+ */
+ res = make_hypervisor_node(d, kinfo, addrcells, sizecells);
+ if ( res )
+ return res;
}
res = fdt_end_node(kinfo->fdt);
--
2.48.1
