diff --git a/[refs] b/[refs]
index f340f6555021..2d28a526ea04 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e75898fe2499ece0ac3f1475982a828b3283b0d
+refs/heads/master: b5bd6a0e5fa8c0376d9746c566fe3daaa51ec825
diff --git a/trunk/lib/flex_proportions.c b/trunk/lib/flex_proportions.c
index c785554f9523..ebf3bac460b0 100644
--- a/trunk/lib/flex_proportions.c
+++ b/trunk/lib/flex_proportions.c
@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p)
  */
 bool fprop_new_period(struct fprop_global *p, int periods)
 {
-	u64 events;
+	s64 events;
 	unsigned long flags;
 
 	local_irq_save(flags);