diff --git a/[refs] b/[refs]
index f80674838c27..0dbbe9ca1f30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be2136e5c99fd5faa655e571b507362b27df1a28
+refs/heads/master: 3d9ead7c06e51249a92eb710a892a66601bd7290
diff --git a/trunk/include/trace/events/regmap.h b/trunk/include/trace/events/regmap.h
index 1c76f40dee44..e35e37c378c6 100644
--- a/trunk/include/trace/events/regmap.h
+++ b/trunk/include/trace/events/regmap.h
@@ -57,14 +57,14 @@ DEFINE_EVENT(regmap_reg, regmap_reg_read,
 
 DECLARE_EVENT_CLASS(regmap_block,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count),
 
 	TP_STRUCT__entry(
 		__string(	name,		dev_name(dev)	)
 		__field(	unsigned int,	reg		)
-		__field(	size_t,		count		)
+		__field(	int,		count		)
 	),
 
 	TP_fast_assign(
@@ -75,33 +75,33 @@ DECLARE_EVENT_CLASS(regmap_block,
 
 	TP_printk("%s reg=%x count=%d", __get_str(name),
 		  (unsigned int)__entry->reg,
-		  (size_t)__entry->count)
+		  (int)__entry->count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_read_start,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_read_done,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_write_start,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );
 
 DEFINE_EVENT(regmap_block, regmap_hw_write_done,
 
-	TP_PROTO(struct device *dev, unsigned int reg, size_t count),
+	TP_PROTO(struct device *dev, unsigned int reg, int count),
 
 	TP_ARGS(dev, reg, count)
 );