Re: [PATCH 1/5] x86_64: allow compilation if ! USER32

[Samuel Thibault]

Applied, thanks!

Luca Dariz, le lun. 27 févr. 2023 21:44:57 +0100, a ecrit:
> * i386/intel/pmap.c: remove #error and allow compilation, keeping a
>   reminder to fix the pmap module.
> ---
>  i386/intel/pmap.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
> index 302a60cb..40f672b5 100644
> --- a/i386/intel/pmap.c
> +++ b/i386/intel/pmap.c
> @@ -1473,7 +1473,8 @@ void pmap_destroy(pmap_t p)
>           /* In this case we know we have one PDP for user space */
>           pt_entry_t *pdp = (pt_entry_t *) 
> ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
>  #else
> -#error "TODO do 64-bit userspace need more that 512G?"
> +#warning "TODO do 64-bit userspace need more that 512G?"
> +         pt_entry_t *pdp = (pt_entry_t *) 
> ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
>  #endif /* USER32 */
>           page_dir = (pt_entry_t *) ptetokv(pdp[i]);
>  #else /* __x86_64__ */
> @@ -2482,7 +2483,8 @@ void pmap_collect(pmap_t p)
>           /* In this case we know we have one PDP for user space */
>           pdp = (pt_entry_t *) 
> ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
>  #else
> -#error "TODO do 64-bit userspace need more that 512G?"
> +#warning "TODO do 64-bit userspace need more that 512G?"
> +         pdp = (pt_entry_t *) 
> ptetokv(p->l4base[lin2l4num(VM_MIN_USER_ADDRESS)]);
>  #endif /* USER32 */
>           page_dir = (pt_entry_t *) ptetokv(pdp[i]);
>  #else /* __x86_64__ */
> -- 
> 2.30.2
> 
> 

-- 
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.