Commit 575b1967 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

timerfd: export defines to userspace 

Since userspace is expected to call timerfd syscalls directly with these
flags/ioctls, make sure we export them so they don't have to duplicate
the values themselves.

Link: http://lkml.kernel.org/r/20161219064052.7196-1-vapier@gentoo.org


Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5bbc8a6

include/linux/timerfd.h

+1 −19
Original line number Diff line number Diff line
@@ -8,23 +8,7 @@ 
#ifndef _LINUX_TIMERFD_H

#define _LINUX_TIMERFD_H



/* For O_CLOEXEC and O_NONBLOCK */

#include <linux/fcntl.h>



/* For _IO helpers */

#include <linux/ioctl.h>



/*

 * CAREFUL: Check include/asm-generic/fcntl.h when defining

 * new flags, since they might collide with O_* ones. We want

 * to re-use O_* flags that couldn't possibly have a meaning

 * from eventfd, in order to leave a free define-space for

 * shared O_* flags.

 */

#define TFD_TIMER_ABSTIME (1 << 0)

#define TFD_TIMER_CANCEL_ON_SET (1 << 1)

#define TFD_CLOEXEC O_CLOEXEC

#define TFD_NONBLOCK O_NONBLOCK

#include <uapi/linux/timerfd.h>



#define TFD_SHARED_FCNTL_FLAGS (TFD_CLOEXEC | TFD_NONBLOCK)

/* Flags for timerfd_create.  */
@@ -32,6 +16,4 @@ 
/* Flags for timerfd_settime.  */

#define TFD_SETTIME_FLAGS (TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET)



#define TFD_IOC_SET_TICKS	_IOW('T', 0, u64)



#endif /* _LINUX_TIMERFD_H */

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ header-y += telephony.h 
header-y += termios.h

header-y += thermal.h

header-y += time.h

header-y += timerfd.h

header-y += times.h

header-y += timex.h

header-y += tiocl.h

include/uapi/linux/timerfd.h

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 *  include/linux/timerfd.h

 *

 *  Copyright (C) 2007  Davide Libenzi <davidel@xmailserver.org>

 *

 */



#ifndef _UAPI_LINUX_TIMERFD_H

#define _UAPI_LINUX_TIMERFD_H



#include <linux/types.h>



/* For O_CLOEXEC and O_NONBLOCK */

#include <linux/fcntl.h>



/* For _IO helpers */

#include <linux/ioctl.h>



/*

 * CAREFUL: Check include/asm-generic/fcntl.h when defining

 * new flags, since they might collide with O_* ones. We want

 * to re-use O_* flags that couldn't possibly have a meaning

 * from eventfd, in order to leave a free define-space for

 * shared O_* flags.

 *

 * Also make sure to update the masks in include/linux/timerfd.h

 * when adding new flags.

 */

#define TFD_TIMER_ABSTIME (1 << 0)

#define TFD_TIMER_CANCEL_ON_SET (1 << 1)

#define TFD_CLOEXEC O_CLOEXEC

#define TFD_NONBLOCK O_NONBLOCK



#define TFD_IOC_SET_TICKS	_IOW('T', 0, __u64)



#endif /* _UAPI_LINUX_TIMERFD_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE