diff --git a/[refs] b/[refs]
index 6d078a3891ce..06d1c3817fcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8521fcc5e0ad3e79bbc4231bb20a6cdc2b50164
+refs/heads/master: f40c396a9ab04eae526990e2b2cef875b424ed4e
diff --git a/trunk/include/linux/ratelimit.h b/trunk/include/linux/ratelimit.h
index 668cf1bef030..8f69d09a41a5 100644
--- a/trunk/include/linux/ratelimit.h
+++ b/trunk/include/linux/ratelimit.h
@@ -2,7 +2,7 @@
 #define _LINUX_RATELIMIT_H
 
 #include <linux/param.h>
-#include <linux/spinlock_types.h>
+#include <linux/spinlock.h>
 
 #define DEFAULT_RATELIMIT_INTERVAL	(5 * HZ)
 #define DEFAULT_RATELIMIT_BURST		10
@@ -25,6 +25,17 @@ struct ratelimit_state {
 		.burst		= burst_init,				\
 	}
 
+static inline void ratelimit_state_init(struct ratelimit_state *rs,
+					int interval, int burst)
+{
+	spin_lock_init(&rs->lock);
+	rs->interval = interval;
+	rs->burst = burst;
+	rs->printed = 0;
+	rs->missed = 0;
+	rs->begin = 0;
+}
+
 extern int ___ratelimit(struct ratelimit_state *rs, const char *func);
 #define __ratelimit(state) ___ratelimit(state, __func__)