On Tue, Mar 22, 2022 at 08:46:58AM -0700, Khem Raj wrote:
> linux only wires MAP_SYNC for architectures which include
> asm-generic/mman-common.h and mips is one such architecture which is not
> including this file via linux/mman.h, therefore as a fall back
> these constants should be defined for such architectures on Linux
> as well.
> 
> This fixes build on mips/musl/linux
> 
> Signed-off-by: Khem Raj <raj.k...@gmail.com>
> Cc: Zhang Yi <yi.z.zh...@linux.intel.com>
> Cc: Michael S. Tsirkin <m...@redhat.com>

Acked-by: Michael S. Tsirkin <m...@redhat.com>

who's merging this? mips tree?

> ---
> v2: Improve commit message
> 
>  util/mmap-alloc.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
> index 893d864354..86d3cda248 100644
> --- a/util/mmap-alloc.c
> +++ b/util/mmap-alloc.c
> @@ -10,14 +10,18 @@
>   * later.  See the COPYING file in the top-level directory.
>   */
>  
> +#include "qemu/osdep.h"
>  #ifdef CONFIG_LINUX
>  #include <linux/mman.h>
> -#else  /* !CONFIG_LINUX */
> +#endif  /* CONFIG_LINUX */
> +
> +#ifndef MAP_SYNC
>  #define MAP_SYNC              0x0
> +#endif /* MAP_SYNC */
> +#ifndef MAP_SHARED_VALIDATE
>  #define MAP_SHARED_VALIDATE   0x0
> -#endif /* CONFIG_LINUX */
> +#endif /* MAP_SHARED_VALIDATE */
>  
> -#include "qemu/osdep.h"
>  #include "qemu/mmap-alloc.h"
>  #include "qemu/host-utils.h"
>  #include "qemu/cutils.h"
> -- 
> 2.35.1


Reply via email to