diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2013-12-30 20:30:28 +0530 |
---|---|---|
committer | Bharat Nihalani <bnihalani@nvidia.com> | 2013-12-30 20:30:28 +0530 |
commit | 546f63c2a5ecbf08064d9a65b799906832dbe2e6 (patch) | |
tree | b4e9b8eb333935f83109fac0426ec3dfac21c85a /include/linux/mm.h | |
parent | b9695b63896bea96cf2ad192673429eac7f9f467 (diff) | |
parent | c5149b1e38ecd5c3f3d3add7fc118fb47b719929 (diff) |
Merge branch 'remotes/android/android-3.10' into dev-kernel-3.10
Change-Id: I0c919e55654e0c224a5f8a5df80d9f49e92dbb37
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r-- | include/linux/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index bd8a403b3279..6e470e3d171b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1487,7 +1487,7 @@ extern int vma_adjust(struct vm_area_struct *vma, unsigned long start, extern struct vm_area_struct *vma_merge(struct mm_struct *, struct vm_area_struct *prev, unsigned long addr, unsigned long end, unsigned long vm_flags, struct anon_vma *, struct file *, pgoff_t, - struct mempolicy *); + struct mempolicy *, const char __user *); extern struct anon_vma *find_mergeable_anon_vma(struct vm_area_struct *); extern int split_vma(struct mm_struct *, struct vm_area_struct *, unsigned long addr, int new_below); |