summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-03-10 19:53:09 +0100
committerThomas Gleixner <tglx@linutronix.de>2014-03-10 19:53:09 +0100
commitf9a8a0abc3138a623895dcb6c2575ca31ca3da34 (patch)
tree0c02144a1eb71dda90aa8f65cab6c216db72c44d /kernel/time
parent38edbb0b913d73713c23dcc742669f7e78b52aa7 (diff)
parent64e8d20bd39b81994d9cd60e7b42f8ec8652f5af (diff)
downloadlinux-f9a8a0abc3138a623895dcb6c2575ca31ca3da34.tar.bz2
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>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/timekeeping_debug.c2
1 files changed, 2 insertions, 0 deletions
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)