Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 333c47c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'block-dir' of git://brick.kernel.dk/data/git/linux-2.6-block

parents 8f0cb147 c6ea2ba7

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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
+14 −0
Original line number Diff line number Diff line 
#

# 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

+3 −3
Original line number Diff line number Diff line
@@ -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
+10 −0
Original line number Diff line number Diff line 
#

# 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

+0 −0

File moved.

View file