git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmemcheck: Fix build errors due to missing slab.h
[safe/jmp/linux-2.6]
/
mm
/
filemap_xip.c
diff --git
a/mm/filemap_xip.c
b/mm/filemap_xip.c
index
0c04615
..
83364df
100644
(file)
--- a/
mm/filemap_xip.c
+++ b/
mm/filemap_xip.c
@@
-17,6
+17,7
@@
#include <linux/sched.h>
#include <linux/seqlock.h>
#include <linux/mutex.h>
#include <linux/sched.h>
#include <linux/seqlock.h>
#include <linux/mutex.h>
+#include <linux/gfp.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/io.h>
@@
-89,8
+90,8
@@
do_xip_mapping_read(struct address_space *mapping,
}
}
nr = nr - offset;
}
}
nr = nr - offset;
- if (nr > len)
- nr = len;
+ if (nr > len
- copied
)
+ nr = len
- copied
;
error = mapping->a_ops->get_xip_mem(mapping, index, 0,
&xip_mem, &xip_pfn);
error = mapping->a_ops->get_xip_mem(mapping, index, 0,
&xip_mem, &xip_pfn);
@@
-194,7
+195,7
@@
retry:
flush_cache_page(vma, address, pte_pfn(*pte));
pteval = ptep_clear_flush_notify(vma, address, pte);
page_remove_rmap(page);
flush_cache_page(vma, address, pte_pfn(*pte));
pteval = ptep_clear_flush_notify(vma, address, pte);
page_remove_rmap(page);
- dec_mm_counter(mm,
file_rss
);
+ dec_mm_counter(mm,
MM_FILEPAGES
);
BUG_ON(pte_dirty(pteval));
pte_unmap_unlock(pte, ptl);
page_cache_release(page);
BUG_ON(pte_dirty(pteval));
pte_unmap_unlock(pte, ptl);
page_cache_release(page);
@@
-296,7
+297,7
@@
out:
}
}
}
}
-static struct vm_operations_struct xip_file_vm_ops = {
+static
const
struct vm_operations_struct xip_file_vm_ops = {
.fault = xip_file_fault,
};
.fault = xip_file_fault,
};