diff --git a/[refs] b/[refs]
index e378bb87e5fe..41b9ca7cba31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3396620cace20639bdf380f893f4dccad090d91
+refs/heads/master: 788e770eb2d17212eafaeedde0be56e3444c6b9a
diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c
index 75ca2a740471..7d20d764b847 100644
--- a/trunk/kernel/rcutorture.c
+++ b/trunk/kernel/rcutorture.c
@@ -899,7 +899,7 @@ rcu_torture_init(void)
 	/* Set up the freelist. */
 
 	INIT_LIST_HEAD(&rcu_torture_freelist);
-	for (i = 0; i < sizeof(rcu_tortures) / sizeof(rcu_tortures[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(rcu_tortures); i++) {
 		rcu_tortures[i].rtort_mbtest = 0;
 		list_add_tail(&rcu_tortures[i].rtort_free,
 			      &rcu_torture_freelist);