Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 731a2c24532df32ca532184e7c714911a338dd9c..e607728db4a8f011ba80739a1f1cea17aff023bc 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -469,7 +469,7 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping,
        if (error)
                goto out;
 
-       error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM);
+       error = radix_tree_maybe_preload(gfp_mask & ~__GFP_HIGHMEM);
        if (error == 0) {
                page_cache_get(page);
                page->mapping = mapping;