From f8c668891c7cb73cd6ecbf503e21bd4f87b25843 Mon Sep 17 00:00:00 2001
From: vignesh babu <vignesh.babu@wipro.com>
Date: Fri, 12 Oct 2007 16:11:39 +0200
Subject: [PATCH] --- yaml --- r: 67629 b: refs/heads/master c:
 e108cebb21316714de43767e242316c784471740 h: refs/heads/master i:   67627:
 c733404925832c650ce9f61e2dc335a5756d6fb6 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/s390/block/dasd_int.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 47d95e7bfe65..24b5b33e0bae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b18a2db416088ad54a4bfb59c0b932be383aee83
+refs/heads/master: e108cebb21316714de43767e242316c784471740
diff --git a/trunk/drivers/s390/block/dasd_int.h b/trunk/drivers/s390/block/dasd_int.h
index aeda52682446..d427daeef511 100644
--- a/trunk/drivers/s390/block/dasd_int.h
+++ b/trunk/drivers/s390/block/dasd_int.h
@@ -53,6 +53,7 @@
 #include <linux/genhd.h>
 #include <linux/hdreg.h>
 #include <linux/interrupt.h>
+#include <linux/log2.h>
 #include <asm/ccwdev.h>
 #include <linux/workqueue.h>
 #include <asm/debug.h>
@@ -456,7 +457,7 @@ dasd_free_chunk(struct list_head *chunk_list, void *mem)
 static inline int
 dasd_check_blocksize(int bsize)
 {
-	if (bsize < 512 || bsize > 4096 || (bsize & (bsize - 1)) != 0)
+	if (bsize < 512 || bsize > 4096 || !is_power_of_2(bsize))
 		return -EMEDIUMTYPE;
 	return 0;
 }