[2/2] Linux: Remove epoll_create, inotify_init from syscalls.list

Message ID a7958b34ad6331bb08b0d3f15d25e888da40a6bb.1671451274.git.fweimer@redhat.com
State Committed
Commit c1c0dea38833751f36a145c322ce53c9a08332e1
Headers
Series Fix incorrect stub warnings after generic refactor |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Florian Weimer Dec. 19, 2022, 12:03 p.m. UTC
  Their presence causes stub warnings to be created on architectures
which do not implement them.

Fixes commit d1d23b134244d59c4d6ef2295 ("Lninux: consolidate
epoll_create implementation") and commit 842128f160a48e5545900ea3b
("Linux: consolidate inotify_init implementation").
---
 sysdeps/unix/sysv/linux/Makefile      | 2 ++
 sysdeps/unix/sysv/linux/syscalls.list | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Adhemerval Zanella Netto Dec. 19, 2022, 12:16 p.m. UTC | #1
On 19/12/22 09:03, Florian Weimer wrote:
> Their presence causes stub warnings to be created on architectures
> which do not implement them.
> 
> Fixes commit d1d23b134244d59c4d6ef2295 ("Lninux: consolidate
> epoll_create implementation") and commit 842128f160a48e5545900ea3b
> ("Linux: consolidate inotify_init implementation").

LGTM, thanks.

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

> ---
>  sysdeps/unix/sysv/linux/Makefile      | 2 ++
>  sysdeps/unix/sysv/linux/syscalls.list | 2 --
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 42e51625ab..f298878e8f 100644
> --- a/sysdeps/unix/sysv/linux/Makefile
> +++ b/sysdeps/unix/sysv/linux/Makefile
> @@ -62,6 +62,7 @@ sysdep_routines += \
>    clone3 \
>    closefrom_fallback \
>    convert_scm_timestamps \
> +  epoll_create \
>    epoll_pwait \
>    epoll_pwait2 \
>    epoll_wait \
> @@ -73,6 +74,7 @@ sysdep_routines += \
>    fxstat64 \
>    fxstatat \
>    fxstatat64 \
> +  inotify_init \
>    lxstat \
>    lxstat64 \
>    mlock2 \
> diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
> index b9f45463c5..73e941ef89 100644
> --- a/sysdeps/unix/sysv/linux/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/syscalls.list
> @@ -6,7 +6,6 @@ capget		EXTRA	capget		i:pp	capget
>  capset		EXTRA	capset		i:pp	capset
>  create_module	EXTRA	create_module	3	__compat_create_module	create_module@GLIBC_2.0:GLIBC_2.23
>  delete_module	EXTRA	delete_module	3	delete_module
> -epoll_create	EXTRA	epoll_create	i:i	epoll_create
>  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
>  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
>  eventfd		EXTRA	eventfd2	i:ii	eventfd
> @@ -28,7 +27,6 @@ getresgid	-	getresgid	i:ppp	getresgid
>  getsid		-	getsid		i:i	getsid
>  init_module	EXTRA	init_module	5	init_module
>  inotify_add_watch	EXTRA	inotify_add_watch	i:isi	inotify_add_watch
> -inotify_init	EXTRA	inotify_init	i:	inotify_init
>  inotify_init1	EXTRA	inotify_init1	i:I	inotify_init1
>  inotify_rm_watch	EXTRA	inotify_rm_watch	i:ii	inotify_rm_watch
>  ioperm		-	ioperm		i:UUi	ioperm
  

Patch

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 42e51625ab..f298878e8f 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -62,6 +62,7 @@  sysdep_routines += \
   clone3 \
   closefrom_fallback \
   convert_scm_timestamps \
+  epoll_create \
   epoll_pwait \
   epoll_pwait2 \
   epoll_wait \
@@ -73,6 +74,7 @@  sysdep_routines += \
   fxstat64 \
   fxstatat \
   fxstatat64 \
+  inotify_init \
   lxstat \
   lxstat64 \
   mlock2 \
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index b9f45463c5..73e941ef89 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -6,7 +6,6 @@  capget		EXTRA	capget		i:pp	capget
 capset		EXTRA	capset		i:pp	capset
 create_module	EXTRA	create_module	3	__compat_create_module	create_module@GLIBC_2.0:GLIBC_2.23
 delete_module	EXTRA	delete_module	3	delete_module
-epoll_create	EXTRA	epoll_create	i:i	epoll_create
 epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
 epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
 eventfd		EXTRA	eventfd2	i:ii	eventfd
@@ -28,7 +27,6 @@  getresgid	-	getresgid	i:ppp	getresgid
 getsid		-	getsid		i:i	getsid
 init_module	EXTRA	init_module	5	init_module
 inotify_add_watch	EXTRA	inotify_add_watch	i:isi	inotify_add_watch
-inotify_init	EXTRA	inotify_init	i:	inotify_init
 inotify_init1	EXTRA	inotify_init1	i:I	inotify_init1
 inotify_rm_watch	EXTRA	inotify_rm_watch	i:ii	inotify_rm_watch
 ioperm		-	ioperm		i:UUi	ioperm