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

Commit f9a8a0ab authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parents 38edbb0b 64e8d20b

fs/timerfd.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

kernel/time/timekeeping_debug.c

+2 −0
Original line number Diff line number Diff line
@@ -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)