diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:16:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:16:14 -0400 |
commit | 003386fff3e02e51cea882e60f7d28290113964c (patch) | |
tree | 253001a9a0fc609b757362708edc2dcaab9e2a14 /mm | |
parent | 092405cdb66f060918160ae730640b449ed7b827 (diff) | |
parent | 51921cb746f56983db5a373ca68deb2b0d3ddf01 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
mm: export generic_pipe_buf_*() to modules
fuse: support splice() reading from fuse device
fuse: allow splice to move pages
mm: export remove_from_page_cache() to modules
mm: export lru_cache_add_*() to modules
fuse: support splice() writing to fuse device
fuse: get page reference for readpages
fuse: use get_user_pages_fast()
fuse: remove unneeded variable
Diffstat (limited to 'mm')
-rw-r--r-- | mm/filemap.c | 1 | ||||
-rw-r--r-- | mm/swap.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 45a2d18df849..20e5642e9f9f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -151,6 +151,7 @@ void remove_from_page_cache(struct page *page) | |||
151 | spin_unlock_irq(&mapping->tree_lock); | 151 | spin_unlock_irq(&mapping->tree_lock); |
152 | mem_cgroup_uncharge_cache_page(page); | 152 | mem_cgroup_uncharge_cache_page(page); |
153 | } | 153 | } |
154 | EXPORT_SYMBOL(remove_from_page_cache); | ||
154 | 155 | ||
155 | static int sync_page(void *word) | 156 | static int sync_page(void *word) |
156 | { | 157 | { |
@@ -224,6 +224,7 @@ void __lru_cache_add(struct page *page, enum lru_list lru) | |||
224 | ____pagevec_lru_add(pvec, lru); | 224 | ____pagevec_lru_add(pvec, lru); |
225 | put_cpu_var(lru_add_pvecs); | 225 | put_cpu_var(lru_add_pvecs); |
226 | } | 226 | } |
227 | EXPORT_SYMBOL(__lru_cache_add); | ||
227 | 228 | ||
228 | /** | 229 | /** |
229 | * lru_cache_add_lru - add a page to a page list | 230 | * lru_cache_add_lru - add a page to a page list |