Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754441AbdGJQbd (ORCPT ); Mon, 10 Jul 2017 12:31:33 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:30915 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754018AbdGJQbb (ORCPT ); Mon, 10 Jul 2017 12:31:31 -0400 Date: Mon, 10 Jul 2017 17:31:29 +0100 From: Eric Engestrom To: Benjamin Gaignard CC: , , , , , , , Subject: Re: [PATCH] fbdev: make get_fb_unmapped_area depends of !MMU Message-ID: <20170710163129.bymeqbmuoiyzo6os@imgtec.com> References: <1499698135-24526-1-git-send-email-benjamin.gaignard@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: <1499698135-24526-1-git-send-email-benjamin.gaignard@linaro.org> User-Agent: NeoMutt/20170609 (1.8.3) X-Originating-IP: [10.60.4.28] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 40 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 > --- > 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 >