From 64e7ed45164360e614919bdfdc3c91f29e26c3c9 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Wed, 6 Feb 2008 01:36:51 -0800
Subject: [PATCH] --- yaml --- r: 83410 b: refs/heads/master c:
 67a3b2b6ce09809b21f60401e81663f2c8131640 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3f8655b0618b..f048a1ca9ad8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2118116e5ed2432a054d52f9925dbf92d2cb7279
+refs/heads/master: 67a3b2b6ce09809b21f60401e81663f2c8131640
diff --git a/trunk/drivers/block/rd.c b/trunk/drivers/block/rd.c
index 82f4eecc8699..06e23be70904 100644
--- a/trunk/drivers/block/rd.c
+++ b/trunk/drivers/block/rd.c
@@ -56,6 +56,7 @@
 #include <linux/backing-dev.h>
 #include <linux/blkpg.h>
 #include <linux/writeback.h>
+#include <linux/log2.h>
 
 #include <asm/uaccess.h>
 
@@ -450,7 +451,7 @@ static int __init rd_init(void)
 	err = -ENOMEM;
 
 	if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 ||
-			(rd_blocksize & (rd_blocksize-1))) {
+			!is_power_of_2(rd_blocksize)) {
 		printk("RAMDISK: wrong blocksize %d, reverting to defaults\n",
 		       rd_blocksize);
 		rd_blocksize = BLOCK_SIZE;