Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9282ee authored by Davide Libenzi's avatar Davide Libenzi Committed by Linus Torvalds
Browse files

timerfd: wire the new timerfd API to the x86 family 



Wires up the new timerfd API to the x86 family.

Signed-off-by: default avatarDavide Libenzi <davidel@xmailserver.org>
Cc: Michael Kerrisk <mtk-manpages@gmx.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4d672e7a

arch/x86/ia32/ia32entry.S

+3 −1
Original line number Diff line number Diff line
@@ -722,7 +722,9 @@ ia32_sys_call_table: 
	.quad sys_epoll_pwait

	.quad compat_sys_utimensat	/* 320 */

	.quad compat_sys_signalfd

	.quad compat_sys_timerfd

	.quad sys_timerfd_create

	.quad sys_eventfd

	.quad sys32_fallocate

	.quad compat_sys_timerfd_settime	/* 325 */

	.quad compat_sys_timerfd_gettime

ia32_syscall_end:

arch/x86/kernel/syscall_table_32.S

+3 −1
Original line number Diff line number Diff line
@@ -321,6 +321,8 @@ ENTRY(sys_call_table) 
	.long sys_epoll_pwait

	.long sys_utimensat		/* 320 */

	.long sys_signalfd

	.long sys_timerfd

	.long sys_timerfd_create

	.long sys_eventfd

	.long sys_fallocate

	.long sys_timerfd_settime	/* 325 */

	.long sys_timerfd_gettime

include/asm-x86/unistd_32.h

+3 −1
Original line number Diff line number Diff line
@@ -327,9 +327,11 @@ 
#define __NR_epoll_pwait	319

#define __NR_utimensat		320

#define __NR_signalfd		321

#define __NR_timerfd		322

#define __NR_timerfd_create	322

#define __NR_eventfd		323

#define __NR_fallocate		324

#define __NR_timerfd_settime	325

#define __NR_timerfd_gettime	326



#ifdef __KERNEL__

include/asm-x86/unistd_64.h

+7 −2
Original line number Diff line number Diff line
@@ -629,12 +629,17 @@ __SYSCALL(__NR_utimensat, sys_utimensat) 
__SYSCALL(__NR_epoll_pwait, sys_epoll_pwait)

#define __NR_signalfd				282

__SYSCALL(__NR_signalfd, sys_signalfd)

#define __NR_timerfd				283

__SYSCALL(__NR_timerfd, sys_timerfd)

#define __NR_timerfd_create			283

__SYSCALL(__NR_timerfd_create, sys_timerfd_create)

#define __NR_eventfd				284

__SYSCALL(__NR_eventfd, sys_eventfd)

#define __NR_fallocate				285

__SYSCALL(__NR_fallocate, sys_fallocate)

#define __NR_timerfd_settime			286

__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime)

#define __NR_timerfd_gettime			287

__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime)





#ifndef __NO_STUBS

#define __ARCH_WANT_OLD_READDIR