Merge ../bleed-2.6

[linux-2.6-omap-h63xx.git] / drivers / block / rd.c

diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index f8a8b68dced013a6d88a5272934a59719b89e461..68c60a5bcdabaf4f172854bbd1df959ecbe80689 100644 (file)
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -74,7 +74,7 @@ static struct request_queue *rd_queue[CONFIG_BLK_DEV_RAM_COUNT];
  * architecture-specific setup routine (from the stored boot sector
  * information).
  */
-static int rd_size = CONFIG_BLK_DEV_RAM_SIZE;  /* Size of the RAM disks */
+int rd_size = CONFIG_BLK_DEV_RAM_SIZE;         /* Size of the RAM disks */
 /*
  * It would be very desirable to have a soft-blocksize (that in the case
  * of the ramdisk driver is also the hardblocksize ;) of PAGE_SIZE because
@@ -348,7 +348,7 @@ static int rd_open(struct inode *inode, struct file *filp)
                struct block_device *bdev = inode->i_bdev;
                struct address_space *mapping;
                unsigned bsize;
-               int gfp_mask;
+               gfp_t gfp_mask;
 
                inode = igrab(bdev->bd_inode);
                rd_bdev[unit] = bdev;