Merge branch 'master'

2006-07-31 08:59:59 -04:00
parent 5dd9feafb3 b6ff50833a
commit b1b934d31d
350 changed files with 3224 additions and 2744 deletions
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -849,8 +849,6 @@ static void shrink_readahead_size_eio(struct file *filp,
 		return;

 	ra->ra_pages /= 4;
-	printk(KERN_WARNING "Reducing readahead size to %luK\n",
-			ra->ra_pages << (PAGE_CACHE_SHIFT - 10));
 }

 /**