Message ID | 20220304174701.1453977-25-marco.solieri@minervasys.tech (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Arm cache coloring | expand |
Hi, On 04/03/2022 17:46, Marco Solieri wrote: > From: Luca Miccio <lucmiccio@gmail.com> > > In order to relocate Xen the function get_xen_paddr will be used in the > following patches. The method has "consider_modules" as a prerequisite > so it has to be enabled both for ARM32 and coloring. > > Signed-off-by: Luca Miccio <lucmiccio@gmail.com> > --- > xen/arch/arm/setup.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c > index f39c62ea70..0bfe12da57 100644 > --- a/xen/arch/arm/setup.c > +++ b/xen/arch/arm/setup.c > @@ -442,7 +442,7 @@ static void * __init relocate_fdt(paddr_t dtb_paddr, size_t dtb_size) > return fdt; > } > > -#ifdef CONFIG_ARM_32 > +#if defined (CONFIG_ARM_32) || (CONFIG_COLORING) Please fold this change in the first use of consider_modules(). Cheers,
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index f39c62ea70..0bfe12da57 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -442,7 +442,7 @@ static void * __init relocate_fdt(paddr_t dtb_paddr, size_t dtb_size) return fdt; } -#ifdef CONFIG_ARM_32 +#if defined (CONFIG_ARM_32) || (CONFIG_COLORING) /* * Returns the end address of the highest region in the range s..e * with required size and alignment that does not conflict with the