diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 11:52:00 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-13 11:52:00 -0700 |
commit | da16dd9785f88680c4affe176c07e85067d4fdd7 (patch) | |
tree | 93937c99c403a47ba2e37c955026d8d84621a586 /drivers/video/fbdev/core | |
parent | 38f7d2da4e39d454f2cb3e7c1ae35afde3d61123 (diff) | |
parent | 4c99ceda0d067c06f228a27b6870f548d3218cc6 (diff) | |
download | linux-da16dd9785f88680c4affe176c07e85067d4fdd7.tar.bz2 |
Merge tag 'fbdev-v4.13' of git://github.com/bzolnier/linux
Pull fbdev updates from Bartlomiej Zolnierkiewicz:
"There is nothing really major here, just a couple of small bugfixes,
improvements and cleanups.
- fix get_fb_unmapped_area() helper handling (Benjamin Gaignard)
- check return value of clk_prepare_enable() in pxafb driver (Arvind
Yadav)
- fix error path handling in vmlfb driver (Alexey Khoroshilov)
- printks fixes/cleanups for uvesafb driver (Joe Perches)
- fix unusued variable warning in atyfb driver (Arnd Bergmann)
- constifications for sh_mobile_lcdcfb, fsl-diu-fb, omapfb (Arvind
Yadav)
- mdacon driver cleanups (Jiri Slaby)
- misc cleanups (Andy Shevchenko, Karim Eshapa, Gustavo A. R. Silva,
Dan Carpenter)"
* tag 'fbdev-v4.13' of git://github.com/bzolnier/linux:
fbdev: make get_fb_unmapped_area depends of !MMU
atyfb: hide unused variable
video: fbdev: matrox: the list iterator can't be NULL
video: fbdev: aty: remove useless variable assignments in aty_var_to_crtc()
fbdev: omapfb: constify ctrl_caps, color_caps, panel_attr_grp and ctrl_attr_grp
omapfb: panel-dsi-cm: constify dsicm_attr_group
vmlfb: Fix error handling in cr_pll_init()
video: fbdev: fsl-diu-fb: constify mfb_template and fsl_diu_match.
uvesafb: Fix continuation printks without KERN_LEVEL to pr_cont, neatening
video: fbdev: sh_mobile_lcdcfb: constify sh_mobile_lcdc_bl_ops.
omapfb: Use sysfs_match_string() helper
video: fbdev: pxafb: Handle return value of clk_prepare_enable
video: fbdev: omap2: omapfb: displays: panel-dsi-cm: Use time comparison kernel macro.
mdacon: replace MDA_ADDR macro by inline function
mdacon: make mda_vram_base u16 *
mdacon: align code in mda_detect properly
Diffstat (limited to 'drivers/video/fbdev/core')
-rw-r--r-- | drivers/video/fbdev/core/fbmem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 5324358f110f..7a42238db446 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1483,7 +1483,7 @@ __releases(&info->lock) 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) @@ -1510,7 +1510,8 @@ static const struct file_operations fb_fops = { .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 |