Skip to content

Commit

Permalink
[BLOCK] Move all core block layer code to new block/ directory
Browse files Browse the repository at this point in the history
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: Jens Axboe <[email protected]>
  • Loading branch information
Jens Axboe committed Nov 4, 2005
1 parent 0f3278d commit 3a65dfe
Show file tree
Hide file tree
Showing 16 changed files with 29 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,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) \
Expand Down
14 changes: 14 additions & 0 deletions block/Kconfig
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
10 changes: 10 additions & 0 deletions block/Makefile
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 0 additions & 12 deletions drivers/block/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 0 additions & 14 deletions drivers/block/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,7 @@
# 12 June 2000, Christoph Hellwig <[email protected]>
# 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
Expand Down
4 changes: 4 additions & 0 deletions init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -501,3 +501,7 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
endmenu

menu "Block layer"
source "block/Kconfig"
endmenu

0 comments on commit 3a65dfe

Please sign in to comment.