[04/26] Linux: mlock2 syscall number is always available

Message ID 23a3c1501fd4febcf17f10a3c6aeb31c93a25435.1581279333.git.fweimer@redhat.com
State New
Headers show
Series
  • Linux cleanups enabled by built-in system call tables
Related show

Commit Message

Florian Weimer Feb. 9, 2020, 8:19 p.m.
Due to the built-in tables, __NR_mlock2 is always defined.
---
 sysdeps/unix/sysv/linux/mlock2.c | 2 --
 1 file changed, 2 deletions(-)

-- 
2.24.1

Comments

Adhemerval Zanella Feb. 27, 2020, 11:06 p.m. | #1
On 09/02/2020 17:19, Florian Weimer wrote:
> Due to the built-in tables, __NR_mlock2 is always defined.


LGTM, thanks. 

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>


> ---

>  sysdeps/unix/sysv/linux/mlock2.c | 2 --

>  1 file changed, 2 deletions(-)

> 

> diff --git a/sysdeps/unix/sysv/linux/mlock2.c b/sysdeps/unix/sysv/linux/mlock2.c

> index 7cea23d47c..e52f43f35c 100644

> --- a/sysdeps/unix/sysv/linux/mlock2.c

> +++ b/sysdeps/unix/sysv/linux/mlock2.c

> @@ -27,11 +27,9 @@ mlock2 (const void *addr, size_t length, unsigned int flags)

>  #else

>    if (flags == 0)

>      return INLINE_SYSCALL_CALL (mlock, addr, length);

> -# ifdef __NR_mlock2

>    int ret = INLINE_SYSCALL_CALL (mlock2, addr, length, flags);

>    if (ret == 0 || errno != ENOSYS)

>      return ret;

> -# endif /* __NR_mlock2 */

>    /* Treat the missing system call as an invalid (non-zero) flag

>       argument.  */

>    __set_errno (EINVAL);

>

Patch

diff --git a/sysdeps/unix/sysv/linux/mlock2.c b/sysdeps/unix/sysv/linux/mlock2.c
index 7cea23d47c..e52f43f35c 100644
--- a/sysdeps/unix/sysv/linux/mlock2.c
+++ b/sysdeps/unix/sysv/linux/mlock2.c
@@ -27,11 +27,9 @@  mlock2 (const void *addr, size_t length, unsigned int flags)
 #else
   if (flags == 0)
     return INLINE_SYSCALL_CALL (mlock, addr, length);
-# ifdef __NR_mlock2
   int ret = INLINE_SYSCALL_CALL (mlock2, addr, length, flags);
   if (ret == 0 || errno != ENOSYS)
     return ret;
-# endif /* __NR_mlock2 */
   /* Treat the missing system call as an invalid (non-zero) flag
      argument.  */
   __set_errno (EINVAL);