projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...
[linux-2.6-microblaze.git]
/
drivers
/
video
/
fb_defio.c
diff --git
a/drivers/video/fb_defio.c
b/drivers/video/fb_defio.c
index
c27e153
..
1ddeb11
100644
(file)
--- a/
drivers/video/fb_defio.c
+++ b/
drivers/video/fb_defio.c
@@
-23,7
+23,7
@@
#include <linux/rmap.h>
#include <linux/pagemap.h>
#include <linux/rmap.h>
#include <linux/pagemap.h>
-struct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
+st
atic st
ruct page *fb_deferred_io_page(struct fb_info *info, unsigned long offs)
{
void *screen_base = (void __force *) info->screen_base;
struct page *page;
{
void *screen_base = (void __force *) info->screen_base;
struct page *page;
@@
-107,6
+107,10
@@
static int fb_deferred_io_mkwrite(struct vm_area_struct *vma,
/* protect against the workqueue changing the page list */
mutex_lock(&fbdefio->lock);
/* protect against the workqueue changing the page list */
mutex_lock(&fbdefio->lock);
+ /* first write in this cycle, notify the driver */
+ if (fbdefio->first_io && list_empty(&fbdefio->pagelist))
+ fbdefio->first_io(info);
+
/*
* We want the page to remain locked from ->page_mkwrite until
* the PTE is marked dirty to avoid page_mkclean() being called
/*
* We want the page to remain locked from ->page_mkwrite until
* the PTE is marked dirty to avoid page_mkclean() being called