Merge branch 'virtio-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty...

[~andy/linux] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index cdcb59450b491c2af7acf64bda54a82eaf0c16ab..31e4f55773f1c4e1959feffca13f6eb121b24e5f 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4200,12 +4200,6 @@ static void buffer_pipe_buf_release(struct pipe_inode_info *pipe,
        buf->private = 0;
 }
 
-static int buffer_pipe_buf_steal(struct pipe_inode_info *pipe,
-                                struct pipe_buffer *buf)
-{
-       return 1;
-}
-
 static void buffer_pipe_buf_get(struct pipe_inode_info *pipe,
                                struct pipe_buffer *buf)
 {
@@ -4221,7 +4215,7 @@ static const struct pipe_buf_operations buffer_pipe_buf_ops = {
        .unmap                  = generic_pipe_buf_unmap,
        .confirm                = generic_pipe_buf_confirm,
        .release                = buffer_pipe_buf_release,
-       .steal                  = buffer_pipe_buf_steal,
+       .steal                  = generic_pipe_buf_steal,
        .get                    = buffer_pipe_buf_get,
 };