aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe2005-11-04 01:43:35 -0600
committerJens Axboe2005-11-04 01:43:35 -0600
commit3a65dfe8c088143c7155cfd36a72f4b0ad2fc4b2 (patch)
treedb930c9f71f94d3ee674f65e38c38e95ca97227e
parent0f3278d14f0255e4cd9e07ccefc33ff12d8bb59c (diff)
downloadkernel-common-3a65dfe8c088143c7155cfd36a72f4b0ad2fc4b2.tar.gz
kernel-common-3a65dfe8c088143c7155cfd36a72f4b0ad2fc4b2.tar.xz
kernel-common-3a65dfe8c088143c7155cfd36a72f4b0ad2fc4b2.zip
[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: Jens Axboe <axboe@suse.de>
-rw-r--r--Makefile2
-rw-r--r--block/Kconfig14
-rw-r--r--block/Kconfig.iosched (renamed from drivers/block/Kconfig.iosched)0
-rw-r--r--block/Makefile10
-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/Kconfig12
-rw-r--r--drivers/block/Makefile14
-rw-r--r--init/Kconfig4
16 files changed, 29 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 79601320ac3..a0270c5c3f3 100644
--- a/Makefile
+++ b/Makefile
@@ -582,7 +582,7 @@ export MODLIB
582 582
583 583
584ifeq ($(KBUILD_EXTMOD),) 584ifeq ($(KBUILD_EXTMOD),)
585core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ 585core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
586 586
587vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 587vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
588 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 588 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff --git a/block/Kconfig b/block/Kconfig
new file mode 100644
index 00000000000..eb48edb80c1
--- /dev/null
+++ b/block/Kconfig
@@ -0,0 +1,14 @@
1#
2# Block layer core configuration
3#
4#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
5#for instance.
6config LBD
7 bool "Support for Large Block Devices"
8 depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
9 help
10 Say Y here if you want to attach large (bigger than 2TB) discs to
11 your machine, or if you want to have a raid or loopback device
12 bigger than 2TB. Otherwise say N.
13
14source block/Kconfig.iosched
diff --git a/drivers/block/Kconfig.iosched b/block/Kconfig.iosched
index 5b90d2fa63b..5b90d2fa63b 100644
--- a/drivers/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
diff --git a/block/Makefile b/block/Makefile
new file mode 100644
index 00000000000..7e4f93e2b44
--- /dev/null
+++ b/block/Makefile
@@ -0,0 +1,10 @@
1#
2# Makefile for the kernel block layer
3#
4
5obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
6
7obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
8obj-$(CONFIG_IOSCHED_AS) += as-iosched.o
9obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
10obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
diff --git a/drivers/block/as-iosched.c b/block/as-iosched.c
index c6744ff3829..c6744ff3829 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 ecacca9c877..ecacca9c877 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 7929471d7df..7929471d7df 100644
--- a/drivers/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
diff --git a/drivers/block/elevator.c b/block/elevator.c
index d4a49a3df82..d4a49a3df82 100644
--- a/drivers/block/elevator.c
+++ b/block/elevator.c
diff --git a/drivers/block/genhd.c b/block/genhd.c
index 54aec4a1ae1..54aec4a1ae1 100644
--- a/drivers/block/genhd.c
+++ b/block/genhd.c
diff --git a/drivers/block/ioctl.c b/block/ioctl.c
index 6e278474f9a..6e278474f9a 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 2747741677f..2747741677f 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 e54f006e7e6..e54f006e7e6 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 382dea7b224..382dea7b224 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 51b0af1cebe..7b1cd93892b 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -409,16 +409,6 @@ config BLK_DEV_INITRD
409 for details. 409 for details.
410 410
411 411
412#XXX - it makes sense to enable this only for 32-bit subarch's, not for x86_64
413#for instance.
414config LBD
415 bool "Support for Large Block Devices"
416 depends on X86 || (MIPS && 32BIT) || PPC32 || ARCH_S390_31 || SUPERH || UML
417 help
418 Say Y here if you want to attach large (bigger than 2TB) discs to
419 your machine, or if you want to have a raid or loopback device
420 bigger than 2TB. Otherwise say N.
421
422config CDROM_PKTCDVD 412config CDROM_PKTCDVD
423 tristate "Packet writing on CD/DVD media" 413 tristate "Packet writing on CD/DVD media"
424 depends on !UML 414 depends on !UML
@@ -455,8 +445,6 @@ config CDROM_PKTCDVD_WCACHE
455 445
456source "drivers/s390/block/Kconfig" 446source "drivers/s390/block/Kconfig"
457 447
458source "drivers/block/Kconfig.iosched"
459
460config ATA_OVER_ETH 448config ATA_OVER_ETH
461 tristate "ATA over Ethernet support" 449 tristate "ATA over Ethernet support"
462 depends on NET 450 depends on NET
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 1cf09a1c065..3ec1f8df87b 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -4,21 +4,7 @@
4# 12 June 2000, Christoph Hellwig <hch@infradead.org> 4# 12 June 2000, Christoph Hellwig <hch@infradead.org>
5# Rewritten to use lists instead of if-statements. 5# Rewritten to use lists instead of if-statements.
6# 6#
7# Note : at this point, these files are compiled on all systems.
8# In the future, some of these should be built conditionally.
9#
10
11#
12# NOTE that ll_rw_blk.c must come early in linkage order - it starts the
13# kblockd threads
14#
15
16obj-y := elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
17 7
18obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
19obj-$(CONFIG_IOSCHED_AS) += as-iosched.o
20obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
21obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
22obj-$(CONFIG_MAC_FLOPPY) += swim3.o 8obj-$(CONFIG_MAC_FLOPPY) += swim3.o
23obj-$(CONFIG_BLK_DEV_FD) += floppy.o 9obj-$(CONFIG_BLK_DEV_FD) += floppy.o
24obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o 10obj-$(CONFIG_BLK_DEV_FD98) += floppy98.o
diff --git a/init/Kconfig b/init/Kconfig
index 3dcbd5bfd49..ea097e0a9c0 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -501,3 +501,7 @@ config STOP_MACHINE
501 help 501 help
502 Need stop_machine() primitive. 502 Need stop_machine() primitive.
503endmenu 503endmenu
504
505menu "Block layer"
506source "block/Kconfig"
507endmenu