diff --git a/[refs] b/[refs]
index 9d07f703f681..60c489fe75a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14f50b49fdab8f4c9fc87b55d3631e3bf1ffd385
+refs/heads/master: a638b2dc951c4cafea31b34a1db1c3d94809649e
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 0a44298fb353..8e67634e79a0 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1444,8 +1444,7 @@ int bitmap_create(mddev_t *mddev)
 	if (err)
 		goto error;
 
-	bitmap->chunkshift = find_first_bit(&bitmap->chunksize,
-					sizeof(bitmap->chunksize));
+	bitmap->chunkshift = ffz(~bitmap->chunksize);
 
 	/* now that chunksize and chunkshift are set, we can use these macros */
  	chunks = (blocks + CHUNK_BLOCK_RATIO(bitmap) - 1) /