diff options
author | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-12-05 14:15:30 -0500 |
commit | c89a86bb96307019867d11874ef0b86adaa0598e (patch) | |
tree | c44c1a825e8a143a4c52bcb8692292aeb77fa64e /mm/memory.c | |
parent | 07475ffba5800c53573180dd521273642adcd0e9 (diff) | |
parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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. |