diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-30 22:14:04 -0700 |
| commit | 2e3ee613480563a6d5c01b57d342e65cc58c06df (patch) | |
| tree | b6b82d1ade41f137bdb9a5a18d8aa446e149c8b2 /lib/Makefile | |
| parent | 1fad1e9a747687a7399bf58e87974f9b1bbcae06 (diff) | |
| parent | 331cbdeedeb2f4ef01ccb761513708af0fe77098 (diff) | |
| download | talos-op-linux-2e3ee613480563a6d5c01b57d342e65cc58c06df.tar.gz talos-op-linux-2e3ee613480563a6d5c01b57d342e65cc58c06df.zip | |
Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
Pull writeback updates from Wu Fengguang:
"Use time based periods to age the writeback proportions, which can
adapt equally well to fast/slow devices."
Fix up trivial conflict in comment in fs/sync.c
* tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
writeback: Fix some comment errors
block: Convert BDI proportion calculations to flexible proportions
lib: Fix possible deadlock in flexible proportion code
lib: Proportions with flexible period
Diffstat (limited to 'lib/Makefile')
| -rw-r--r-- | lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Makefile b/lib/Makefile index 9cb4104f47d9..42d283edc4d3 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -11,7 +11,7 @@ lib-y := ctype.o string.o vsprintf.o cmdline.o \ rbtree.o radix-tree.o dump_stack.o timerqueue.o\ idr.o int_sqrt.o extable.o prio_tree.o \ sha1.o md5.o irq_regs.o reciprocal_div.o argv_split.o \ - proportions.o prio_heap.o ratelimit.o show_mem.o \ + proportions.o flex_proportions.o prio_heap.o ratelimit.o show_mem.o \ is_single_threaded.o plist.o decompress.o lib-$(CONFIG_MMU) += ioremap.o |
