Commit 3a65dfe8 authored by Jens Axboe's avatar Jens Axboe

[BLOCK] Move all core block layer code to new block/ directory

drivers/block/ is right now a mix of core and driver parts. Lets move
the core parts to a new top level directory. Al will move the fs/
related block parts to block/ next.
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 0f3278d1
...@@ -582,7 +582,7 @@ export MODLIB ...@@ -582,7 +582,7 @@ export MODLIB
ifeq ($(KBUILD_EXTMOD),) 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) \ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
......
#
# 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
#
# 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
...@@ -409,16 +409,6 @@ config BLK_DEV_INITRD ...@@ -409,16 +409,6 @@ config BLK_DEV_INITRD
for details. 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 config CDROM_PKTCDVD
tristate "Packet writing on CD/DVD media" tristate "Packet writing on CD/DVD media"
depends on !UML depends on !UML
...@@ -455,8 +445,6 @@ config CDROM_PKTCDVD_WCACHE ...@@ -455,8 +445,6 @@ config CDROM_PKTCDVD_WCACHE
source "drivers/s390/block/Kconfig" source "drivers/s390/block/Kconfig"
source "drivers/block/Kconfig.iosched"
config ATA_OVER_ETH config ATA_OVER_ETH
tristate "ATA over Ethernet support" tristate "ATA over Ethernet support"
depends on NET depends on NET
......
...@@ -4,21 +4,7 @@ ...@@ -4,21 +4,7 @@
# 12 June 2000, Christoph Hellwig <hch@infradead.org> # 12 June 2000, Christoph Hellwig <hch@infradead.org>
# Rewritten to use lists instead of if-statements. # 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_MAC_FLOPPY) += swim3.o
obj-$(CONFIG_BLK_DEV_FD) += floppy.o obj-$(CONFIG_BLK_DEV_FD) += floppy.o
obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o
......
...@@ -501,3 +501,7 @@ config STOP_MACHINE ...@@ -501,3 +501,7 @@ config STOP_MACHINE
help help
Need stop_machine() primitive. Need stop_machine() primitive.
endmenu endmenu
menu "Block layer"
source "block/Kconfig"
endmenu
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment