diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-24 02:17:25 -0400 |
| commit | a3d3362287fbe96fe90abdb5c6d1a35471129a8c (patch) | |
| tree | ad3c85ed1feef470c66599eb514e30f43c2db5dd /include/linux/pagemap.h | |
| parent | fb7f045ace0624f1e59a7db8497e460bd54b1cbc (diff) | |
| parent | 4bbba111d94781d34081c37856bbc5eb33f6c72a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'include/linux/pagemap.h')
| -rw-r--r-- | include/linux/pagemap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 9c66e994540f..29ebba54c238 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h | |||
| @@ -455,8 +455,9 @@ int add_to_page_cache_locked(struct page *page, struct address_space *mapping, | |||
| 455 | pgoff_t index, gfp_t gfp_mask); | 455 | pgoff_t index, gfp_t gfp_mask); |
| 456 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, | 456 | int add_to_page_cache_lru(struct page *page, struct address_space *mapping, |
| 457 | pgoff_t index, gfp_t gfp_mask); | 457 | pgoff_t index, gfp_t gfp_mask); |
| 458 | extern void remove_from_page_cache(struct page *page); | 458 | extern void delete_from_page_cache(struct page *page); |
| 459 | extern void __remove_from_page_cache(struct page *page); | 459 | extern void __delete_from_page_cache(struct page *page); |
| 460 | int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask); | ||
| 460 | 461 | ||
| 461 | /* | 462 | /* |
| 462 | * Like add_to_page_cache_locked, but used to add newly allocated pages: | 463 | * Like add_to_page_cache_locked, but used to add newly allocated pages: |