diff options
author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /mm/nommu.c | |
parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) |
Merge branch 'merge'
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 5151c44a8257..c576df71e3bb 100644 --- a/mm/nommu.c +++ b/mm/nommu.c | |||
@@ -1070,6 +1070,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, | |||
1070 | vma->vm_start = vma->vm_pgoff << PAGE_SHIFT; | 1070 | vma->vm_start = vma->vm_pgoff << PAGE_SHIFT; |
1071 | return 0; | 1071 | return 0; |
1072 | } | 1072 | } |
1073 | EXPORT_SYMBOL(remap_pfn_range); | ||
1073 | 1074 | ||
1074 | void swap_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) | 1075 | void swap_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) |
1075 | { | 1076 | { |
@@ -1090,6 +1091,7 @@ void unmap_mapping_range(struct address_space *mapping, | |||
1090 | int even_cows) | 1091 | int even_cows) |
1091 | { | 1092 | { |
1092 | } | 1093 | } |
1094 | EXPORT_SYMBOL(unmap_mapping_range); | ||
1093 | 1095 | ||
1094 | /* | 1096 | /* |
1095 | * Check that a process has enough memory to allocate a new virtual | 1097 | * Check that a process has enough memory to allocate a new virtual |