Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
index 84a3a7ba072ac92507f98d1011c5f15a85b96703..6fbfb8f417b9cd9d60d72ff6b6a0c9c54c520ce1 100644 (file)
--- a/kernel/trace/trace_clock.c
+++ b/kernel/trace/trace_clock.c
@@ -13,6 +13,7 @@
  * Tracer plugins will chose a default from these clocks.
  */
 #include <linux/spinlock.h>
+#include <linux/irqflags.h>
 #include <linux/hardirq.h>
 #include <linux/module.h>
 #include <linux/percpu.h>