diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 04:31:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-29 04:31:13 +0200 |
| commit | 8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e (patch) | |
| tree | 3c451f9c21123046806724680a3a8aebd48e6247 /fs/pipe.c | |
| parent | Merge branch 'agp-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/a... (diff) | |
| parent | docbook: add pipes, other fixes (diff) | |
| download | linux-8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e.tar.xz linux-8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
docbook: add pipes, other fixes
blktrace: use cpu_clock() instead of sched_clock()
bsg: Fix build for CONFIG_BLOCK=n
[patch] QUEUE_FLAG_READFULL QUEUE_FLAG_WRITEFULL comment fix
Diffstat (limited to 'fs/pipe.c')
| -rw-r--r-- | fs/pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pipe.c b/fs/pipe.c index d007830d9c87..6b3d91a691bf 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -255,7 +255,7 @@ void generic_pipe_buf_get(struct pipe_inode_info *pipe, struct pipe_buffer *buf) /** * generic_pipe_buf_confirm - verify contents of the pipe buffer - * @pipe: the pipe that the buffer belongs to + * @info: the pipe that the buffer belongs to * @buf: the buffer to confirm * * Description: |