diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-06 11:51:38 +0000 |
| commit | 76e8de404a34bfff318da0b31e752db2642511f3 (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /include/linux/mm.h | |
| parent | e9b3bd248b349433215cf01064a866b632fb3f4b (diff) | |
| parent | 354d86f4daecdc3553830e553f6fc17add736234 (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultzv3.10/topic/android-fixes
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 bd5679ddcd3..01eb01df922 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1486,7 +1486,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); |