diff --git a/[refs] b/[refs]
index 5fddf785d17d..495609af9ba8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8115f3f0c939c5db0fe3c6c6c58911fd3a205b1e
+refs/heads/master: 21798a84ab383cdac0e7ee3368e0792b718b867d
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 06951e229443..bc577dcc0e47 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -34,6 +34,7 @@
 
 #include <linux/stacktrace.h>
 #include <linux/ring_buffer.h>
+#include <linux/irqflags.h>
 
 #include "trace.h"