Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1685576
| From | Benjamin Gaignard <benjamin.gaignard@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2] fbdev: make get_fb_unmapped_area depends of !MMU |
| Date | 2017-07-12 09:50 +0200 |
| Message-ID | <u2kzf-5ja-7@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
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> --- version 2: - remove duplicated "\" 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..f20c5d2 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) && \ + !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 — Next in thread | Find similar | Unroll thread
[PATCH v2] fbdev: make get_fb_unmapped_area depends of !MMU Benjamin Gaignard <benjamin.gaignard@linaro.org> - 2017-07-12 09:50 +0200 Re: [PATCH v2] fbdev: make get_fb_unmapped_area depends of !MMU Daniel Vetter <daniel@ffwll.ch> - 2017-07-12 10:20 +0200 Re: [PATCH v2] fbdev: make get_fb_unmapped_area depends of !MMU Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> - 2017-07-12 18:40 +0200
csiph-web