diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-24 15:36:56 -0400 |
| commit | b9f12a5d97f652c77ef6803dccd0d40d1290f5be (patch) | |
| tree | 8f58c8620ffef0d350a5ec022feda492a96b179a /include/linux/ceph/libceph.h | |
| parent | 9d8dc3e529a19e427fd379118acd132520935c5d (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
Merge tag 'v3.16-rc6' into next
Merge with mainline to bring in changes to MFD to allow merging
ipaq-micro-ts driver.
Diffstat (limited to 'include/linux/ceph/libceph.h')
| -rw-r--r-- | include/linux/ceph/libceph.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h index 2f49aa4c4f7f..279b0afac1c1 100644 --- a/include/linux/ceph/libceph.h +++ b/include/linux/ceph/libceph.h | |||
| @@ -222,8 +222,6 @@ extern void ceph_copy_to_page_vector(struct page **pages, | |||
| 222 | extern void ceph_copy_from_page_vector(struct page **pages, | 222 | extern void ceph_copy_from_page_vector(struct page **pages, |
| 223 | void *data, | 223 | void *data, |
| 224 | loff_t off, size_t len); | 224 | loff_t off, size_t len); |
| 225 | extern int ceph_copy_page_vector_to_user(struct page **pages, void __user *data, | ||
| 226 | loff_t off, size_t len); | ||
| 227 | extern void ceph_zero_page_vector_range(int off, int len, struct page **pages); | 225 | extern void ceph_zero_page_vector_range(int off, int len, struct page **pages); |
| 228 | 226 | ||
| 229 | 227 | ||