diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | block/Kconfig | 14 | ||||
| -rw-r--r-- | block/Kconfig.iosched (renamed from drivers/block/Kconfig.iosched) | 6 | ||||
| -rw-r--r-- | block/Makefile | 10 | ||||
| -rw-r--r-- | block/as-iosched.c (renamed from drivers/block/as-iosched.c) | 0 | ||||
| -rw-r--r-- | block/cfq-iosched.c (renamed from drivers/block/cfq-iosched.c) | 0 | ||||
| -rw-r--r-- | block/deadline-iosched.c (renamed from drivers/block/deadline-iosched.c) | 0 | ||||
| -rw-r--r-- | block/elevator.c (renamed from drivers/block/elevator.c) | 0 | ||||
| -rw-r--r-- | block/genhd.c (renamed from drivers/block/genhd.c) | 0 | ||||
| -rw-r--r-- | block/ioctl.c (renamed from drivers/block/ioctl.c) | 0 | ||||
| -rw-r--r-- | block/ll_rw_blk.c (renamed from drivers/block/ll_rw_blk.c) | 0 | ||||
| -rw-r--r-- | block/noop-iosched.c (renamed from drivers/block/noop-iosched.c) | 0 | ||||
| -rw-r--r-- | block/scsi_ioctl.c (renamed from drivers/block/scsi_ioctl.c) | 0 | ||||
| -rw-r--r-- | drivers/block/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/block/Makefile | 14 | ||||
| -rw-r--r-- | init/Kconfig | 4 |
16 files changed, 32 insertions, 30 deletions
@@ -583,7 +583,7 @@ export MODLIB ifeq ($(KBUILD_EXTMOD),) -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ diff --git a/block/Kconfig b/block/Kconfig new file mode 100644 index 000000000000..eb48edb80c1d --- /dev/null +++ b/block/Kconfig @@ -0,0 +1,14 @@ +# +# Block layer core configuration +# +#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64 +#for instance. +config LBD + bool "Support for Large Block Devices" + depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML + help + Say Y here if you want to attach large (bigger than 2TB) discs to + your machine, or if you want to have a raid or loopback device + bigger than 2TB. Otherwise say N. + +source block/Kconfig.iosched diff --git a/drivers/block/Kconfig.iosched b/block/Kconfig.iosched index 5b90d2fa63b8..f3b7753aac99 100644 --- a/drivers/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -46,13 +46,13 @@ choice block devices. config DEFAULT_AS - bool "Anticipatory" if IOSCHED_AS + bool "Anticipatory" if IOSCHED_AS=y config DEFAULT_DEADLINE - bool "Deadline" if IOSCHED_DEADLINE + bool "Deadline" if IOSCHED_DEADLINE=y config DEFAULT_CFQ - bool "CFQ" if IOSCHED_CFQ + bool "CFQ" if IOSCHED_CFQ=y config DEFAULT_NOOP bool "No-op" diff --git a/block/Makefile b/block/Makefile new file mode 100644 index 000000000000..7e4f93e2b44e --- /dev/null +++ b/block/Makefile @@ -0,0 +1,10 @@ +# +# Makefile for the kernel block layer +# + +obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o + +obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o +obj-$(CONFIG_IOSCHED_AS) += as-iosched.o +obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o +obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o diff --git a/drivers/block/as-iosched.c b/block/as-iosched.c index a78e160b59a3..a78e160b59a3 100644 --- a/drivers/block/as-iosched.c +++ b/block/as-iosched.c diff --git a/drivers/block/cfq-iosched.c b/block/cfq-iosched.c index ecacca9c877e..ecacca9c877e 100644 --- a/drivers/block/cfq-iosched.c +++ b/block/cfq-iosched.c diff --git a/drivers/block/deadline-iosched.c b/block/deadline-iosched.c index 7929471d7df7..7929471d7df7 100644 --- a/drivers/block/deadline-iosched.c +++ b/block/deadline-iosched.c diff --git a/drivers/block/elevator.c b/block/elevator.c index d4a49a3df829..d4a49a3df829 100644 --- a/drivers/block/elevator.c +++ b/block/elevator.c diff --git a/drivers/block/genhd.c b/block/genhd.c index 54aec4a1ae13..54aec4a1ae13 100644 --- a/drivers/block/genhd.c +++ b/block/genhd.c diff --git a/drivers/block/ioctl.c b/block/ioctl.c index 6e278474f9a8..6e278474f9a8 100644 --- a/drivers/block/ioctl.c +++ b/block/ioctl.c diff --git a/drivers/block/ll_rw_blk.c b/block/ll_rw_blk.c index 5f52e30b43f8..5f52e30b43f8 100644 --- a/drivers/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c diff --git a/drivers/block/noop-iosched.c b/block/noop-iosched.c index e54f006e7e60..e54f006e7e60 100644 --- a/drivers/block/noop-iosched.c +++ b/block/noop-iosched.c diff --git a/drivers/block/scsi_ioctl.c b/block/scsi_ioctl.c index 382dea7b224c..382dea7b224c 100644 --- a/drivers/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 51b0af1cebee..7b1cd93892be 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -409,16 +409,6 @@ config BLK_DEV_INITRD for details. -#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64 -#for instance. -config LBD - bool "Support for Large Block Devices" - depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML - help - Say Y here if you want to attach large (bigger than 2TB) discs to - your machine, or if you want to have a raid or loopback device - bigger than 2TB. Otherwise say N. - config CDROM_PKTCDVD tristate "Packet writing on CD/DVD media" depends on !UML @@ -455,8 +445,6 @@ config CDROM_PKTCDVD_WCACHE source "drivers/s390/block/Kconfig" -source "drivers/block/Kconfig.iosched" - config ATA_OVER_ETH tristate "ATA over Ethernet support" depends on NET diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 1cf09a1c065b..3ec1f8df87b1 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -4,21 +4,7 @@ # 12 June 2000, Christoph Hellwig <hch@infradead.org> # Rewritten to use lists instead of if-statements. # -# Note : at this point, these files are compiled on all systems. -# In the future, some of these should be built conditionally. -# - -# -# NOTE that ll_rw_blk.c must come early in linkage order - it starts the -# kblockd threads -# - -obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o -obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o -obj-$(CONFIG_IOSCHED_AS) += as-iosched.o -obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o -obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o obj-$(CONFIG_MAC_FLOPPY) += swim3.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o diff --git a/init/Kconfig b/init/Kconfig index 3dcbd5bfd498..ea097e0a9c02 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -501,3 +501,7 @@ config STOP_MACHINE help Need stop_machine() primitive. endmenu + +menu "Block layer" +source "block/Kconfig" +endmenu |