diff options
author | Paolo \'Blaisorblade\' Giarrusso <blaisorblade_spam@yahoo.it> | 2005-01-14 23:28:32 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:28:32 -0800 |
commit | 15d9763119f779f114492106e085e1d8840222e1 (patch) | |
tree | 184a89393f5e208fe90ca7b610b3e5bfeb2b4c29 /arch | |
parent | c1317c3b3b9759c4820d75b1cc24164568ad1ea7 (diff) | |
download | history-15d9763119f779f114492106e085e1d8840222e1.tar.gz |
[PATCH] uml: depend on !USERMODE in drivers/block/Kconfig and drop arch/um/Kconfig_block
Finally, we end with this the need to update arch/um/Kconfig_block with
changes in drivers/block/Kconfig - we include directly that; UML-specific
entries were moved into it (they are very few).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/Kconfig | 2 | ||||
-rw-r--r-- | arch/um/Kconfig_block | 105 |
2 files changed, 1 insertions, 106 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 30781fd57a85d8..d9a17c99fe61bc 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -263,7 +263,7 @@ source "drivers/base/Kconfig" source "arch/um/Kconfig_char" -source "arch/um/Kconfig_block" +source "drivers/block/Kconfig" config NETDEVICES bool diff --git a/arch/um/Kconfig_block b/arch/um/Kconfig_block deleted file mode 100644 index 1f0f9ccb4a012d..00000000000000 --- a/arch/um/Kconfig_block +++ /dev/null @@ -1,105 +0,0 @@ - -menu "Block Devices" - -config BLK_DEV_UBD - bool "Virtual block device" - help - The User-Mode Linux port includes a driver called UBD which will let - you access arbitrary files on the host computer as block devices. - Unless you know that you do not need such virtual block devices say - Y here. - -config BLK_DEV_UBD_SYNC - bool "Always do synchronous disk IO for UBD" - depends on BLK_DEV_UBD - help - Writes to the virtual block device are not immediately written to the - host's disk; this may cause problems if, for example, the - User-Mode Linux 'Virtual Machine' uses a journalling filesystem and - the host computer crashes. - - Synchronous operation (i.e. always writing data to the host's disk - immediately) is configurable on a per-UBD basis by using a special - kernel command line option. Alternatively, you can say Y here to - turn on synchronous operation by default for all block devices. - - If you're running a journalling file system (like reiserfs, for - example) in your virtual machine, you will want to say Y here. If - you care for the safety of the data in your virtual machine, Y is a - wise choice too. In all other cases (for example, if you're just - playing around with User-Mode Linux) you can choose N. - -config BLK_DEV_COW_COMMON - bool - default BLK_DEV_UBD - -config BLK_DEV_LOOP - tristate "Loopback device support" - -config BLK_DEV_NBD - tristate "Network block device support" - depends on NET - -config BLK_DEV_RAM - tristate "RAM disk support" - -config BLK_DEV_RAM_COUNT - int "Default number of RAM disks" if BLK_DEV_RAM - default "16" - -config BLK_DEV_RAM_SIZE - int "Default RAM disk size" - depends on BLK_DEV_RAM - default "4096" - -config BLK_DEV_INITRD - bool "Initial RAM disk (initrd) support" - depends on BLK_DEV_RAM=y - -#Copied directly from drivers/block/Kconfig -config INITRAMFS_SOURCE - string "Source directory of cpio_list" - default "" - help - This can be set to either a directory containing files, etc to be - included in the initramfs archive, or a file containing newline - separated entries. - - If it is a file, it should be in the following format: - # a comment - file <name> <location> <mode> <uid> <gid> - dir <name> <mode> <uid> <gid> - nod <name> <mode> <uid> <gid> <dev_type> <maj> <min> - - Where: - <name> name of the file/dir/nod in the archive - <location> location of the file in the current filesystem - <mode> mode/permissions of the file - <uid> user id (0=root) - <gid> group id (0=root) - <dev_type> device type (b=block, c=character) - <maj> major number of nod - <min> minor number of nod - - If you are not sure, leave it blank. - -config MMAPPER - tristate "Example IO memory driver" - depends on BROKEN - help - The User-Mode Linux port can provide support for IO Memory - emulation with this option. This allows a host file to be - specified as an I/O region on the kernel command line. That file - will be mapped into UML's kernel address space where a driver can - locate it and do whatever it wants with the memory, including - providing an interface to it for UML processes to use. - - For more information, see - <http://user-mode-linux.sourceforge.net/iomem.html>. - - If you'd like to be able to provide a simulated IO port space for - User-Mode Linux processes, say Y. If unsure, say N. - -source "drivers/block/Kconfig.iosched" - -endmenu |