diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:37:40 -0400 |
| commit | e16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch) | |
| tree | 640f0f56f2ea676647af4eb42d32fa56be2ee549 /init | |
| parent | 7fd23a24717a327a66f3c32d11a20a2f169c824f (diff) | |
| parent | e6e8dd5055a974935af1398c8648d4a9359b0ecb (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
Update cpuset info & webiste for cgroups
dcdbas: force SMI to happen when expected
arch/arm/Kconfig: remove one to many l's in the word.
asm-generic/user.h: Fix spelling in comment
drm: fix printk typo 'sracth'
Remove one to many n's in a word
Documentation/filesystems/romfs.txt: fixing link to genromfs
drivers:scsi Change printk typo initate -> initiate
serial, pch uart: Remove duplicate inclusion of linux/pci.h header
fs/eventpoll.c: fix spelling
mm: Fix out-of-date comments which refers non-existent functions
drm: Fix printk typo 'failled'
coh901318.c: Change initate to initiate.
mbox-db5500.c Change initate to initiate.
edac: correct i82975x error-info reported
edac: correct i82975x mci initialisation
edac: correct commented info
fs: update comments to point correct document
target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
...
Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index d91de16cf637..56240e724d9a 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -745,9 +745,9 @@ config BLK_CGROUP | |||
| 745 | 745 | ||
| 746 | This option only enables generic Block IO controller infrastructure. | 746 | This option only enables generic Block IO controller infrastructure. |
| 747 | One needs to also enable actual IO controlling logic/policy. For | 747 | One needs to also enable actual IO controlling logic/policy. For |
| 748 | enabling proportional weight division of disk bandwidth in CFQ seti | 748 | enabling proportional weight division of disk bandwidth in CFQ, set |
| 749 | CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set | 749 | CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set |
| 750 | CONFIG_BLK_THROTTLE=y. | 750 | CONFIG_BLK_DEV_THROTTLING=y. |
| 751 | 751 | ||
| 752 | See Documentation/cgroups/blkio-controller.txt for more information. | 752 | See Documentation/cgroups/blkio-controller.txt for more information. |
| 753 | 753 | ||