Merge branch 'fortglx/3.15/time' of git://git.linaro.org/people/john.stultz/linux into timers/core

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

- support CLOCK_BOOTTIME clock in timerfd
- Add missing header file

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Thomas Gleixner 12 years ago f9a8a0ab 38edbb0b

2 changed files

expand all

timerfd.c

kernel

time

timekeeping_debug.c

fs/timerfd.c

··· 317 317 (clockid != CLOCK_MONOTONIC && 318 318 clockid != CLOCK_REALTIME && 319 319 clockid != CLOCK_REALTIME_ALARM && 320 + clockid != CLOCK_BOOTTIME && 320 321 clockid != CLOCK_BOOTTIME_ALARM)) 321 322 return -EINVAL; 322 323

kernel/time/timekeeping_debug.c

··· 21 21 #include <linux/seq_file.h> 22 22 #include <linux/time.h> 23 23 24 + #include "timekeeping_internal.h" 25 + 24 26 static unsigned int sleep_time_bin[32] = {0}; 25 27 26 28 static int tk_debug_show_sleep_time(struct seq_file *s, void *data)