Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'vr' into sg-ns-ics
Conflicts:
	block/Kconfig.iosched
	block/Makefile
  • Loading branch information
stevegaron committed Jan 25, 2012
2 parents 42af17c + 55241ba commit 4834606
Show file tree
Hide file tree
Showing 3 changed files with 459 additions and 0 deletions.
11 changes: 11 additions & 0 deletions block/Kconfig.iosched
Expand Up @@ -82,6 +82,13 @@ config IOSCHED_SIO
basic merging, trying to keep a minimum overhead. It is aimed
mainly for aleatory access devices (eg: flash devices).

config IOSCHED_VR
tristate "V(R) I/O scheduler"
default n
---help---
Requests are chosen according to SSTF with a penalty of rev_penalty
for switching head direction.

choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ
Expand All @@ -103,6 +110,9 @@ choice

config DEFAULT_NOOP
bool "No-op"

config DEFAULT_VR
bool "V(R)" if IOSCHED_VR=y

endchoice

Expand All @@ -113,6 +123,7 @@ config DEFAULT_IOSCHED
default "bfq" if DEFAULT_BFQ
default "sio" if DEFAULT_SIO
default "noop" if DEFAULT_NOOP
default "vr" if DEFAULT_VR

endmenu

Expand Down
1 change: 1 addition & 0 deletions block/Makefile
Expand Up @@ -15,6 +15,7 @@ obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
obj-$(CONFIG_IOSCHED_SIO) += sio-iosched.o
obj-$(CONFIG_IOSCHED_VR) += vr-iosched.o

obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o

0 comments on commit 4834606

Please sign in to comment.