diff options
| author | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-02-02 00:38:15 -0500 |
| commit | ab386128f20c44c458a90039ab1bdc265ac474c9 (patch) | |
| tree | 2ad188744922b1bb951fd10ff50dc04c83acce22 /include/linux/mm.h | |
| parent | dbfc196a3cc1a2514ad0737a82f764de23bd65e6 (diff) | |
| parent | ab658321f32770b903a4426e2a6fae0392757755 (diff) | |
Merge branch 'master' into percpu
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 554fa395aac9..91d2ba1cb6a5 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -1085,6 +1085,7 @@ extern void zone_pcp_update(struct zone *zone); | |||
| 1085 | 1085 | ||
| 1086 | /* nommu.c */ | 1086 | /* nommu.c */ |
| 1087 | extern atomic_long_t mmap_pages_allocated; | 1087 | extern atomic_long_t mmap_pages_allocated; |
| 1088 | extern int nommu_shrink_inode_mappings(struct inode *, size_t, size_t); | ||
| 1088 | 1089 | ||
| 1089 | /* prio_tree.c */ | 1090 | /* prio_tree.c */ |
| 1090 | void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old); | 1091 | void vma_prio_tree_add(struct vm_area_struct *, struct vm_area_struct *old); |