Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block: (67 commits)
  [PATCH] blk_queue_start_tag() shared map race fix
  [PATCH] Update axboe@suse.de email address
  [PATCH] fix creating zero sized bio mempools in low memory system
  [PATCH] CONFIG_BLOCK: blk_congestion_wait() fix
  [PATCH] CONFIG_BLOCK internal.h cleanups
  [PATCH] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6]
  [PATCH] BLOCK: Make it possible to disable the block layer [try #6]
  [PATCH] BLOCK: Remove no-longer necessary linux/buffer_head.h inclusions [try #6]
  [PATCH] BLOCK: Remove no-longer necessary linux/mpage.h inclusions [try #6]
  [PATCH] BLOCK: Move the msdos device ioctl compat stuff to the msdos driver [try #6]
  [PATCH] BLOCK: Move the Ext3 device ioctl compat stuff to the Ext3 driver [try #6]
  [PATCH] BLOCK: Move the Ext2 device ioctl compat stuff to the Ext2 driver [try #6]
  [PATCH] BLOCK: Move the ReiserFS device ioctl compat stuff to the ReiserFS driver [try #6]
  [PATCH] BLOCK: Move common FS-specific ioctls to linux/fs.h [try #6]
  [PATCH] BLOCK: Move the loop device ioctl compat stuff to the loop driver [try #6]
  [PATCH] BLOCK: Move __invalidate_device() to block_dev.c [try #6]
  [PATCH] BLOCK: Dissociate generic_writepages() from mpage stuff [try #6]
  [PATCH] BLOCK: Remove dependence on existence of blockdev_superblock [try #6]
  [PATCH] BLOCK: Move extern declarations out of fs/*.c into header files [try #6]
  [PATCH] BLOCK: Don't call block_sync_page() from AFS [try #6]
  ...

2 files changed, 13 insertions, 2 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 4381006dd666..d2eb7a84a264 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -92,7 +92,7 @@ config LOCALVERSION_AUTO
 
 config SWAP
         bool "Support for paging of anonymous memory (swap)"
-        depends on MMU
+        depends on MMU && BLOCK
         default y
         help
           This option allows you to choose whether you want to have support
diff --git a/init/do_mounts.c b/init/do_mounts.c
index b290aadb1d3f..dc1ec0803ef9 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -285,7 +285,11 @@ void __init mount_block_root(char *name, int flags)
 {
         char *fs_names = __getname();
         char *p;
+#ifdef CONFIG_BLOCK
         char b[BDEVNAME_SIZE];
+#else
+        const char *b = name;
+#endif
 
         get_fs_names(fs_names);
 retry:
@@ -304,7 +308,9 @@ retry:
                  * Allow the user to distinguish between failed sys_open
                  * and bad superblock on root device.
                  */
+#ifdef CONFIG_BLOCK
                 __bdevname(ROOT_DEV, b);
+#endif
                 printk("VFS: Cannot open root device \"%s\" or %s\n",
                                 root_device_name, b);
                 printk("Please append a correct \"root=\" boot option\n");
@@ -316,7 +322,10 @@ retry:
         for (p = fs_names; *p; p += strlen(p)+1)
                 printk(" %s", p);
         printk("\n");
-        panic("VFS: Unable to mount root fs on %s", __bdevname(ROOT_DEV, b));
+#ifdef CONFIG_BLOCK
+        __bdevname(ROOT_DEV, b);
+#endif
+        panic("VFS: Unable to mount root fs on %s", b);
 out:
         putname(fs_names);
 }
@@ -387,8 +396,10 @@ void __init mount_root(void)
                         change_floppy("root floppy");
         }
 #endif
+#ifdef CONFIG_BLOCK
         create_dev("/dev/root", ROOT_DEV);
         mount_block_root("/dev/root", root_mountflags);
+#endif
 }
 
 /*