Re: [PATCH] acpi: Remove erroneous MAP_FIXED

[Samuel Thibault]

Damien Zammit, le sam. 12 févr. 2022 21:57:46 +0000, a ecrit:
> Reading the man page for mmap, MAP_FIXED needs to be removed,
> because we do not want the mapping to be placed at 0.

Applied, thanks!

> ---
>  acpi/acpi.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/acpi/acpi.c b/acpi/acpi.c
> index 63066aaf..395bf56f 100644
> --- a/acpi/acpi.c
> +++ b/acpi/acpi.c
> @@ -43,7 +43,7 @@ mmap_phys_acpi_header(uintptr_t base_addr, struct 
> acpi_header **ptr_to_header,
> 
>    /* Map the ACPI table at the nearest page (rounded down) */
>    *virt_addr = 0;
> -  *virt_addr = mmap(NULL, ESCD_SIZE, PROT_READ, MAP_SHARED | MAP_FIXED,
> +  *virt_addr = mmap(NULL, ESCD_SIZE, PROT_READ, MAP_SHARED,
>                      fd, (off_t) pa_acpi);
> 
>    if (*virt_addr == MAP_FAILED)
> @@ -73,7 +73,7 @@ acpi_get_num_tables(size_t *num_tables)
>      return EPERM;
> 
>    virt_addr = mmap(NULL, ESCD_SIZE, PROT_READ,
> -                   MAP_SHARED | MAP_FIXED, fd_mem, ESCD);
> +                   MAP_SHARED, fd_mem, ESCD);
>    if (virt_addr == MAP_FAILED)
>      return errno;
> 
> @@ -182,7 +182,7 @@ acpi_get_tables(struct acpi_table **tables)
>    if ((fd_mem = open("/dev/mem", O_RDWR)) < 0)
>      return EPERM;
> 
> -  virt_addr = mmap(NULL, ESCD_SIZE, PROT_READ, MAP_SHARED | MAP_FIXED,
> +  virt_addr = mmap(NULL, ESCD_SIZE, PROT_READ, MAP_SHARED,
>                     fd_mem, (off_t) phys_addr);
> 
>    if (virt_addr == MAP_FAILED)
> --
> 2.34.1