diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-29 20:56:07 -0800 |
commit | 606c0dafbe88102d64c1253caed8a2c36987070f (patch) | |
tree | 23ce7b30341e71c6da8e0183d27e29167e833e26 /mm/nommu.c | |
parent | 6ab16d249513a50bef3f1b275cea6aa8d3f51832 (diff) | |
parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
download | kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.tar.gz kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.tar.xz kernel-crypto-606c0dafbe88102d64c1253caed8a2c36987070f.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index 6deb6ab3d6a..c1196812876 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1045,7 +1045,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr) EXPORT_SYMBOL(find_vma); -struct page *follow_page(struct mm_struct *mm, unsigned long address, +struct page *follow_page(struct vm_area_struct *vma, unsigned long address, unsigned int foll_flags) { return NULL; |