diff --git a/[refs] b/[refs]
index b6e2d9c694a5..2795b5986a8f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d18a602e9116dc89da6750dcbda44bb1eb82b8e
+refs/heads/master: ea6728c11f3afa15a9c7c50a6c9ae061fe5a9d00
diff --git a/trunk/drivers/block/viodasd.c b/trunk/drivers/block/viodasd.c
index 41ca721d2523..ebfe038d859e 100644
--- a/trunk/drivers/block/viodasd.c
+++ b/trunk/drivers/block/viodasd.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
 enum {
 	PARTITION_SHIFT = 3,
 	MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
-	MAX_DISK_NAME = sizeof(((struct gendisk *)0)->disk_name)
+	MAX_DISK_NAME = FIELD_SIZEOF(struct gendisk, disk_name)
 };
 
 static DEFINE_SPINLOCK(viodasd_spinlock);