Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

[karo-tx-linux.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 7b48b2ad00e773853780c1dbc314b850307199cb..edb1b0b5cc8dc64367eb9950378a9829a1e07241 100644 (file)
--- 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;
                }