diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-15 07:46:29 -0400 |
| commit | b2aaf8f74cdc84a9182f6cabf198b7763bcb9d40 (patch) | |
| tree | 53ccb1c2c14751fe69cf93102e76e97021f6df07 /include/linux/timerfd.h | |
| parent | 4f962d4d65923d7b722192e729840cfb79af0a5a (diff) | |
| parent | 278429cff8809958d25415ba0ed32b59866ab1a8 (diff) | |
Merge branch 'linus' into stackprotector
Conflicts:
arch/x86/kernel/Makefile
include/asm-x86/pda.h
Diffstat (limited to 'include/linux/timerfd.h')
| -rw-r--r-- | include/linux/timerfd.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/timerfd.h b/include/linux/timerfd.h index cf2b10d75731..86cb0501d3e2 100644 --- a/include/linux/timerfd.h +++ b/include/linux/timerfd.h | |||
| @@ -8,9 +8,15 @@ | |||
| 8 | #ifndef _LINUX_TIMERFD_H | 8 | #ifndef _LINUX_TIMERFD_H |
| 9 | #define _LINUX_TIMERFD_H | 9 | #define _LINUX_TIMERFD_H |
| 10 | 10 | ||
| 11 | /* For O_CLOEXEC and O_NONBLOCK */ | ||
| 12 | #include <linux/fcntl.h> | ||
| 11 | 13 | ||
| 14 | /* Flags for timerfd_settime. */ | ||
| 12 | #define TFD_TIMER_ABSTIME (1 << 0) | 15 | #define TFD_TIMER_ABSTIME (1 << 0) |
| 13 | 16 | ||
| 17 | /* Flags for timerfd_create. */ | ||
| 18 | #define TFD_CLOEXEC O_CLOEXEC | ||
| 19 | #define TFD_NONBLOCK O_NONBLOCK | ||
| 14 | 20 | ||
| 15 | 21 | ||
| 16 | #endif /* _LINUX_TIMERFD_H */ | 22 | #endif /* _LINUX_TIMERFD_H */ |