diff --git a/[refs] b/[refs]
index 6e52cef669a7..cad332032c41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aaabe31c25a439b92cc281b14ca18b85bae7e7a6
+refs/heads/master: 2bf1c05e3c406925e498d06da66b4828f0209ea6
diff --git a/trunk/kernel/time/timecompare.c b/trunk/kernel/time/timecompare.c
index ac38fbb176cc..a9ae369925ce 100644
--- a/trunk/kernel/time/timecompare.c
+++ b/trunk/kernel/time/timecompare.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/math64.h>
+#include <linux/kernel.h>
 
 /*
  * fixed point arithmetic scale factor for skew
@@ -57,11 +58,11 @@ int timecompare_offset(struct timecompare *sync,
 	int index;
 	int num_samples = sync->num_samples;
 
-	if (num_samples > sizeof(buffer)/sizeof(buffer[0])) {
+	if (num_samples > ARRAY_SIZE(buffer)) {
 		samples = kmalloc(sizeof(*samples) * num_samples, GFP_ATOMIC);
 		if (!samples) {
 			samples = buffer;
-			num_samples = sizeof(buffer)/sizeof(buffer[0]);
+			num_samples = ARRAY_SIZE(buffer);
 		}
 	} else {
 		samples = buffer;