[SCSI] Merge up to linux-2.6 head

Conflicts:

	drivers/scsi/jazz_esp.c

Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 7b48b2ad00e7..edb1b0b5cc8d 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -670,7 +670,8 @@ repeat:
         page = find_lock_page(mapping, index);
         if (!page) {
                 if (!cached_page) {
-                        cached_page = alloc_page(gfp_mask);
+                        cached_page =
+                                __page_cache_alloc(gfp_mask);
                         if (!cached_page)
                                 return NULL;
                 }