diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 04:14:13 -0500 |
| commit | 451ec6ab310602515b361418debe93d00f67e273 (patch) | |
| tree | 933cbbe7232ae6cb19986012e3162e65a184b77a /mm/memory.c | |
| parent | fe54ceda4dd71b6155f4a58cd2aad3a780cb347d (diff) | |
| parent | 436b0f76f2cee6617f27a649637766628909dd5d (diff) | |
Merge branch 'master'
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index 4b4fc3a7ea48..aa8af0e20269 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -1223,7 +1223,7 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page * | |||
| 1223 | return -EINVAL; | 1223 | return -EINVAL; |
| 1224 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); | 1224 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); |
| 1225 | } | 1225 | } |
| 1226 | EXPORT_SYMBOL_GPL(vm_insert_page); | 1226 | EXPORT_SYMBOL(vm_insert_page); |
| 1227 | 1227 | ||
| 1228 | /* | 1228 | /* |
| 1229 | * Somebody does a pfn remapping that doesn't actually work as a vma. | 1229 | * Somebody does a pfn remapping that doesn't actually work as a vma. |