Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1684409

Re: [PATCH] fbdev: make get_fb_unmapped_area depends of !MMU

Show all headers | View raw

On Monday, 2017-07-10 16:48:55 +0200, Benjamin Gaignard wrote:
> Even if CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA flag is selected
> do not compile and use get_fb_unmapped_area() if CONFIG_MMU is
> also set. This will avoid mmap errors when compiling multi
> architectures at same time.
> 
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@linaro.org>
> ---
>  drivers/video/fbdev/core/fbmem.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
> index 069fe79..16b5aef 100644
> --- a/drivers/video/fbdev/core/fbmem.c
> +++ b/drivers/video/fbdev/core/fbmem.c
> @@ -1492,7 +1492,7 @@ static long fb_compat_ioctl(struct file *file, unsigned int cmd,
>  	return 0;
>  }
>  
> -#ifdef CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA
> +#if defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA) && !defined(CONFIG_MMU)
>  unsigned long get_fb_unmapped_area(struct file *filp,
>  				   unsigned long addr, unsigned long len,
>  				   unsigned long pgoff, unsigned long flags)
> @@ -1519,7 +1519,8 @@ unsigned long get_fb_unmapped_area(struct file *filp,
>  	.open =		fb_open,
>  	.release =	fb_release,
>  #if defined(HAVE_ARCH_FB_UNMAPPED_AREA) || \
> -    defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA)
> +	(defined(CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA) && \\
                                                        ^^
Double backslash

> +	 !defined(CONFIG_MMU))
>  	.get_unmapped_area = get_fb_unmapped_area,
>  #endif
>  #ifdef CONFIG_FB_DEFERRED_IO
> -- 
> 1.9.1
> 

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] fbdev: make get_fb_unmapped_area depends of !MMU Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-07-10 16:50 +0200
  Re: [PATCH] fbdev: make get_fb_unmapped_area depends of !MMU Eric Engestrom <eric.engestrom@imgtec.com> - 2017-07-10 18:40 +0200

csiph-web