diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-03-10 22:53:09 +0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-03-10 22:53:09 +0400 |
| commit | f9a8a0abc3138a623895dcb6c2575ca31ca3da34 (patch) | |
| tree | 0c02144a1eb71dda90aa8f65cab6c216db72c44d | |
| parent | 38edbb0b913d73713c23dcc742669f7e78b52aa7 (diff) | |
| parent | 64e8d20bd39b81994d9cd60e7b42f8ec8652f5af (diff) | |
| download | linux-f9a8a0abc3138a623895dcb6c2575ca31ca3da34.tar.xz | |
Merge branch 'fortglx/3.15/time' of git://git.linaro.org/people/john.stultz/linux into timers/core
- support CLOCK_BOOTTIME clock in timerfd
- Add missing header file
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | fs/timerfd.c | 1 | ||||
| -rw-r--r-- | kernel/time/timekeeping_debug.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index 929312180dd0..0013142c0475 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -317,6 +317,7 @@ SYSCALL_DEFINE2(timerfd_create, int, clockid, int, flags) (clockid != CLOCK_MONOTONIC && clockid != CLOCK_REALTIME && clockid != CLOCK_REALTIME_ALARM && + clockid != CLOCK_BOOTTIME && clockid != CLOCK_BOOTTIME_ALARM)) return -EINVAL; diff --git a/kernel/time/timekeeping_debug.c b/kernel/time/timekeeping_debug.c index 802433a4f5eb..4d54f97558df 100644 --- a/kernel/time/timekeeping_debug.c +++ b/kernel/time/timekeeping_debug.c @@ -21,6 +21,8 @@ #include <linux/seq_file.h> #include <linux/time.h> +#include "timekeeping_internal.h" + static unsigned int sleep_time_bin[32] = {0}; static int tk_debug_show_sleep_time(struct seq_file *s, void *data) |