2 files changed, 11 insertions, 1 deletions

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 93d94749310b..b5382cedf0c0 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -400,6 +400,16 @@ config BLK_DEV_RAM_SIZE
           what are you doing. If you are using IBM S/390, then set this to
           8192.
 
+config BLK_DEV_RAM_BLOCKSIZE
+        int "Default RAM disk block size (bytes)"
+        depends on BLK_DEV_RAM
+        default "1024"
+        help
+          The default value is 1024 kilobytes.  PAGE_SIZE is a much more
+          efficient choice however.  The default is kept to ensure initrd
+          setups function - apparently needed by the rd_load_image routine
+          that supposes the filesystem in the image uses a 1024 blocksize.
+
 config BLK_DEV_INITRD
         bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support"
         depends on BROKEN || !FRV
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 3cf246abb5ec..a3f64bfe6b58 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -84,7 +84,7 @@ int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */
  * behaviour. The default is still BLOCK_SIZE (needed by rd_load_image that
  * supposes the filesystem in the image uses a BLOCK_SIZE blocksize).
  */
-static int rd_blocksize = BLOCK_SIZE;           /* blocksize of the RAM disks */
+static int rd_blocksize = CONFIG_BLK_DEV_RAM_BLOCKSIZE;
 
 /*
  * Copyright (C) 2000 Linus Torvalds.