diff --git a/[refs] b/[refs]
index d8e9569b63a4..08f69ce04f5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99d4f22e91d26e0f8b113bf7fde65a335d36ad6b
+refs/heads/master: 9a6b090c0d1cd5c90f21db772dbe2fbcf14366de
diff --git a/trunk/drivers/infiniband/core/device.c b/trunk/drivers/infiniband/core/device.c
index 63d2a39fb82c..7fabb425b033 100644
--- a/trunk/drivers/infiniband/core/device.c
+++ b/trunk/drivers/infiniband/core/device.c
@@ -36,6 +36,7 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+#include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
@@ -93,7 +94,7 @@ static int ib_device_check_mandatory(struct ib_device *device)
 	};
 	int i;
 
-	for (i = 0; i < sizeof mandatory_table / sizeof mandatory_table[0]; ++i) {
+	for (i = 0; i < ARRAY_SIZE(mandatory_table); ++i) {
 		if (!*(void **) ((void *) device + mandatory_table[i].offset)) {
 			printk(KERN_WARNING "Device %s is missing mandatory function %s\n",
 			       device->name, mandatory_table[i].name);