Merge branch 'master' into percpu

2010-02-02 14:38:15 +09:00
parent dbfc196a3c ab658321f3
commit ab386128f2
1258 changed files with 33261 additions and 12809 deletions
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1085,6 +1085,7 @@ extern void zone_pcp_update(struct zone *zone);

 /* nommu.c */
 extern atomic_long_t mmap_pages_allocated;
+extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t);

 /* prio_tree.c */
 void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old);