Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci-2.6.23
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci-2.6.23
Commits
333c47c8
Commit
333c47c8
authored
Nov 07, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'block-dir' of
git://brick.kernel.dk/data/git/linux-2.6-block
parents
8f0cb147
c6ea2ba7
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
32 additions
and
30 deletions
+32
-30
Makefile
Makefile
+1
-1
block/Kconfig
block/Kconfig
+14
-0
block/Kconfig.iosched
block/Kconfig.iosched
+3
-3
block/Makefile
block/Makefile
+10
-0
block/as-iosched.c
block/as-iosched.c
+0
-0
block/cfq-iosched.c
block/cfq-iosched.c
+0
-0
block/deadline-iosched.c
block/deadline-iosched.c
+0
-0
block/elevator.c
block/elevator.c
+0
-0
block/genhd.c
block/genhd.c
+0
-0
block/ioctl.c
block/ioctl.c
+0
-0
block/ll_rw_blk.c
block/ll_rw_blk.c
+0
-0
block/noop-iosched.c
block/noop-iosched.c
+0
-0
block/scsi_ioctl.c
block/scsi_ioctl.c
+0
-0
drivers/block/Kconfig
drivers/block/Kconfig
+0
-12
drivers/block/Makefile
drivers/block/Makefile
+0
-14
init/Kconfig
init/Kconfig
+4
-0
No files found.
Makefile
View file @
333c47c8
...
...
@@ -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
)
\
...
...
block/Kconfig
0 → 100644
View file @
333c47c8
#
# 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
drivers/
block/Kconfig.iosched
→
block/Kconfig.iosched
View file @
333c47c8
...
...
@@ -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"
...
...
block/Makefile
0 → 100644
View file @
333c47c8
#
# 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
drivers/
block/as-iosched.c
→
block/as-iosched.c
View file @
333c47c8
File moved
drivers/
block/cfq-iosched.c
→
block/cfq-iosched.c
View file @
333c47c8
File moved
drivers/
block/deadline-iosched.c
→
block/deadline-iosched.c
View file @
333c47c8
File moved
drivers/
block/elevator.c
→
block/elevator.c
View file @
333c47c8
File moved
drivers/
block/genhd.c
→
block/genhd.c
View file @
333c47c8
File moved
drivers/
block/ioctl.c
→
block/ioctl.c
View file @
333c47c8
File moved
drivers/
block/ll_rw_blk.c
→
block/ll_rw_blk.c
View file @
333c47c8
File moved
drivers/
block/noop-iosched.c
→
block/noop-iosched.c
View file @
333c47c8
File moved
drivers/
block/scsi_ioctl.c
→
block/scsi_ioctl.c
View file @
333c47c8
File moved
drivers/block/Kconfig
View file @
333c47c8
...
...
@@ -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
...
...
drivers/block/Makefile
View file @
333c47c8
...
...
@@ -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
...
...
init/Kconfig
View file @
333c47c8
...
...
@@ -501,3 +501,7 @@ config STOP_MACHINE
help
Need stop_machine() primitive.
endmenu
menu "Block layer"
source "block/Kconfig"
endmenu
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment