diff options
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index b5346576e58d..1c31b2fd2ca5 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -377,7 +377,7 @@ int filemap_write_and_wait_range(struct address_space *mapping, | |||
| 377 | * This function does not add the page to the LRU. The caller must do that. | 377 | * This function does not add the page to the LRU. The caller must do that. |
| 378 | */ | 378 | */ |
| 379 | int add_to_page_cache(struct page *page, struct address_space *mapping, | 379 | int add_to_page_cache(struct page *page, struct address_space *mapping, |
| 380 | pgoff_t offset, int gfp_mask) | 380 | pgoff_t offset, gfp_t gfp_mask) |
| 381 | { | 381 | { |
| 382 | int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM); | 382 | int error = radix_tree_preload(gfp_mask & ~__GFP_HIGHMEM); |
| 383 | 383 | ||
| @@ -401,7 +401,7 @@ int add_to_page_cache(struct page *page, struct address_space *mapping, | |||
| 401 | EXPORT_SYMBOL(add_to_page_cache); | 401 | EXPORT_SYMBOL(add_to_page_cache); |
| 402 | 402 | ||
| 403 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | 403 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, |
| 404 | pgoff_t offset, int gfp_mask) | 404 | pgoff_t offset, gfp_t gfp_mask) |
| 405 | { | 405 | { |
| 406 | int ret = add_to_page_cache(page, mapping, offset, gfp_mask); | 406 | int ret = add_to_page_cache(page, mapping, offset, gfp_mask); |
| 407 | if (ret == 0) | 407 | if (ret == 0) |
| @@ -591,7 +591,7 @@ EXPORT_SYMBOL(find_lock_page); | |||
| 591 | * memory exhaustion. | 591 | * memory exhaustion. |
| 592 | */ | 592 | */ |
| 593 | struct page *find_or_create_page(struct address_space *mapping, | 593 | struct page *find_or_create_page(struct address_space *mapping, |
| 594 | unsigned long index, unsigned int gfp_mask) | 594 | unsigned long index, gfp_t gfp_mask) |
| 595 | { | 595 | { |
| 596 | struct page *page, *cached_page = NULL; | 596 | struct page *page, *cached_page = NULL; |
| 597 | int err; | 597 | int err; |
| @@ -683,7 +683,7 @@ struct page * | |||
| 683 | grab_cache_page_nowait(struct address_space *mapping, unsigned long index) | 683 | grab_cache_page_nowait(struct address_space *mapping, unsigned long index) |
| 684 | { | 684 | { |
| 685 | struct page *page = find_get_page(mapping, index); | 685 | struct page *page = find_get_page(mapping, index); |
| 686 | unsigned int gfp_mask; | 686 | gfp_t gfp_mask; |
| 687 | 687 | ||
| 688 | if (page) { | 688 | if (page) { |
| 689 | if (!TestSetPageLocked(page)) | 689 | if (!TestSetPageLocked(page)) |
