diff --git a/[refs] b/[refs]
index ec1c3b3aa216..84bb968bbc15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76fd020937f2d09f76a4cd8dbae1f3bec640ff0b
+refs/heads/master: 5f6e3c836508926e50cebe17ad87f59666a7fb47
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 8e67634e79a0..d47d38ac71b1 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1413,7 +1413,7 @@ int bitmap_create(mddev_t *mddev)
 	int err;
 	sector_t start;
 
-	BUG_ON(sizeof(bitmap_super_t) != 256);
+	BUILD_BUG_ON(sizeof(bitmap_super_t) != 256);
 
 	if (!file && !mddev->bitmap_offset) /* bitmap disabled, nothing to do */
 		return 0;