On 19/01/2026 10:50 am, Harry Ramsey wrote:
> diff --git a/xen/arch/arm/include/asm/mpu.h
> b/xen/arch/arm/include/asm/mpu.h
> index 72fa5b00b8..55011e3d96 100644
> --- a/xen/arch/arm/include/asm/mpu.h
> +++ b/xen/arch/arm/include/asm/mpu.h
> @@ -87,7 +87,12 @@ static inline bool region_is_valid(const pr_t *pr)
> return pr->prlar.reg.en;
> }
>
> -#endif /* __ASSEMBLER__ */
> +static inline register_t generate_vsctlr(uint16_t vmid)
> +{
> + return ((register_t)vmid << VSCTLR_VMID_SHIFT);
> +}
> +
> +#endif /* __ASSEMBLY__ */
>
> #endif /* __ARM_MPU_H__ */
>
You've got a rebasing error here. __ASSEMBLY__ doesn't exist any more.
~Andrew
