git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release
[pandora-kernel.git]
/
block
/
Kconfig.iosched
diff --git
a/block/Kconfig.iosched
b/block/Kconfig.iosched
index
fc71cf0
..
3199b76
100644
(file)
--- a/
block/Kconfig.iosched
+++ b/
block/Kconfig.iosched
@@
-23,7
+23,8
@@
config IOSCHED_DEADLINE
config IOSCHED_CFQ
tristate "CFQ I/O scheduler"
config IOSCHED_CFQ
tristate "CFQ I/O scheduler"
- select BLK_CGROUP if CFQ_GROUP_IOSCHED
+ # If BLK_CGROUP is a module, CFQ has to be built as module.
+ depends on (BLK_CGROUP=m && m) || !BLK_CGROUP || BLK_CGROUP=y
default y
---help---
The CFQ I/O scheduler tries to distribute bandwidth equally
default y
---help---
The CFQ I/O scheduler tries to distribute bandwidth equally
@@
-33,22
+34,15
@@
config IOSCHED_CFQ
This is the default I/O scheduler.
This is the default I/O scheduler.
+ Note: If BLK_CGROUP=m, then CFQ can be built only as module.
+
config CFQ_GROUP_IOSCHED
bool "CFQ Group Scheduling support"
config CFQ_GROUP_IOSCHED
bool "CFQ Group Scheduling support"
- depends on IOSCHED_CFQ &&
CGROUPS
+ depends on IOSCHED_CFQ &&
BLK_CGROUP
default n
---help---
Enable group IO scheduling in CFQ.
default n
---help---
Enable group IO scheduling in CFQ.
-config DEBUG_CFQ_IOSCHED
- bool "Debug CFQ Scheduling"
- depends on CFQ_GROUP_IOSCHED
- select DEBUG_BLK_CGROUP
- default n
- ---help---
- Enable CFQ IO scheduling debugging in CFQ. Currently it makes
- blktrace output more verbose.
-
choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ
choice
prompt "Default I/O scheduler"
default DEFAULT_CFQ