aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2008-02-06 04:36:51 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:03 -0500
commit67a3b2b6ce09809b21f60401e81663f2c8131640 (patch)
tree59005e55d1292762dca1bf58da81c3661982a905
parent2118116e5ed2432a054d52f9925dbf92d2cb7279 (diff)
rd: use is_power_of_2() in drivers/block/rd.c.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/block/rd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 82f4eecc8699..06e23be70904 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -56,6 +56,7 @@
56#include <linux/backing-dev.h> 56#include <linux/backing-dev.h>
57#include <linux/blkpg.h> 57#include <linux/blkpg.h>
58#include <linux/writeback.h> 58#include <linux/writeback.h>
59#include <linux/log2.h>
59 60
60#include <asm/uaccess.h> 61#include <asm/uaccess.h>
61 62
@@ -450,7 +451,7 @@ static int __init rd_init(void)
450 err = -ENOMEM; 451 err = -ENOMEM;
451 452
452 if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 || 453 if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 ||
453 (rd_blocksize & (rd_blocksize-1))) { 454 !is_power_of_2(rd_blocksize)) {
454 printk("RAMDISK: wrong blocksize %d, reverting to defaults\n", 455 printk("RAMDISK: wrong blocksize %d, reverting to defaults\n",
455 rd_blocksize); 456 rd_blocksize);
456 rd_blocksize = BLOCK_SIZE; 457 rd_blocksize = BLOCK_SIZE;