diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 | 
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:39 -0400 | 
| commit | 02b311bce9fc87987a123adc3e6a2d0a2caa70e2 (patch) | |
| tree | ba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9 /mm/filemap.c | |
| parent | 8f0f850e240df5bea027caeb1723142c50e37e57 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 2 | 
1 files changed, 0 insertions, 2 deletions
| diff --git a/mm/filemap.c b/mm/filemap.c index d087fc3d3281..b9a60c43b61a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -849,8 +849,6 @@ static void shrink_readahead_size_eio(struct file *filp, | |||
| 849 | return; | 849 | return; | 
| 850 | 850 | ||
| 851 | ra->ra_pages /= 4; | 851 | ra->ra_pages /= 4; | 
| 852 | printk(KERN_WARNING "Reducing readahead size to %luK\n", | ||
| 853 | ra->ra_pages << (PAGE_CACHE_SHIFT - 10)); | ||
| 854 | } | 852 | } | 
| 855 | 853 | ||
| 856 | /** | 854 | /** | 
