From: Andrew Morton mm/mlock.c: In function 'mlock_fixup': mm/mlock.c:468: error: implicit declaration of function '__mlock_posix_error_return' Documentation/SubmitChecklist considered useful... Cc: KOSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton --- mm/mlock.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff -puN mm/mlock.c~mlock-make-mlock-error-return-posixly-correct-fix mm/mlock.c --- a/mm/mlock.c~mlock-make-mlock-error-return-posixly-correct-fix +++ a/mm/mlock.c @@ -143,18 +143,6 @@ static void munlock_vma_page(struct page } } -/* - * convert get_user_pages() return value to posix mlock() error - */ -static int __mlock_posix_error_return(long retval) -{ - if (retval == -EFAULT) - retval = -ENOMEM; - else if (retval == -ENOMEM) - retval = -EAGAIN; - return retval; -} - /** * __mlock_vma_pages_range() - mlock/munlock a range of pages in the vma. * @vma: target vma @@ -268,6 +256,18 @@ static long __mlock_vma_pages_range(stru return ret; /* count entire vma as locked_vm */ } +/* + * convert get_user_pages() return value to posix mlock() error + */ +static int __mlock_posix_error_return(long retval) +{ + if (retval == -EFAULT) + retval = -ENOMEM; + else if (retval == -ENOMEM) + retval = -EAGAIN; + return retval; +} + #else /* CONFIG_UNEVICTABLE_LRU */ /* @@ -281,6 +281,12 @@ static long __mlock_vma_pages_range(stru return make_pages_present(start, end); return 0; } + +static inline int __mlock_posix_error_return(long retval) +{ + return 0; +} + #endif /* CONFIG_UNEVICTABLE_LRU */ /** _