diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-09 07:13:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-09 07:13:45 -0500 |
| commit | 3c3d7cb1db4af176dab843f22ea092a4ef1eb989 (patch) | |
| tree | 9c1b2951432ed10d0654a8e13cbe57b51260d06b /include/linux/ceph/buffer.h | |
| parent | 0e9f2204cfa6d79abe3e525ddf7c4ab5792cc751 (diff) | |
| parent | 494479038d97f1b9f76fc633a360a681acdf035c (diff) | |
Merge branch 'linus' into perf/core
Refresh the branch to a v3.14-rc base before queueing up new devel patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/ceph/buffer.h')
| -rw-r--r-- | include/linux/ceph/buffer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h index 58d19014068f..07ad423cc37f 100644 --- a/include/linux/ceph/buffer.h +++ b/include/linux/ceph/buffer.h | |||
| @@ -17,7 +17,6 @@ struct ceph_buffer { | |||
| 17 | struct kref kref; | 17 | struct kref kref; |
| 18 | struct kvec vec; | 18 | struct kvec vec; |
| 19 | size_t alloc_len; | 19 | size_t alloc_len; |
| 20 | bool is_vmalloc; | ||
| 21 | }; | 20 | }; |
| 22 | 21 | ||
| 23 | extern struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp); | 22 | extern struct ceph_buffer *ceph_buffer_new(size_t len, gfp_t gfp); |