diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-05-17 18:53:14 -0400 |
| commit | 325a479c4c110db278ef3361460a48c4093252cc (patch) | |
| tree | bcfbf4d0647d9442045639a5c19da59d55190e81 /fs/sysfs | |
| parent | ebcc80c1b6629a445f7471cc1ddb48faf8a84e70 (diff) | |
| parent | 7f9eaedf894dbaa08c157832e9a6c9c03ffed1ed (diff) | |
Merge with temp tree to get David's gdb inferior calls patch
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index da25aeb0e062..364208071e17 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c | |||
| @@ -96,7 +96,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer | |||
| 96 | /** | 96 | /** |
| 97 | * flush_read_buffer - push buffer to userspace. | 97 | * flush_read_buffer - push buffer to userspace. |
| 98 | * @buffer: data buffer for file. | 98 | * @buffer: data buffer for file. |
| 99 | * @userbuf: user-passed buffer. | 99 | * @buf: user-passed buffer. |
| 100 | * @count: number of bytes requested. | 100 | * @count: number of bytes requested. |
| 101 | * @ppos: file position. | 101 | * @ppos: file position. |
| 102 | * | 102 | * |
| @@ -164,7 +164,7 @@ out: | |||
| 164 | /** | 164 | /** |
| 165 | * fill_write_buffer - copy buffer from userspace. | 165 | * fill_write_buffer - copy buffer from userspace. |
| 166 | * @buffer: data buffer for file. | 166 | * @buffer: data buffer for file. |
| 167 | * @userbuf: data from user. | 167 | * @buf: data from user. |
| 168 | * @count: number of bytes in @userbuf. | 168 | * @count: number of bytes in @userbuf. |
| 169 | * | 169 | * |
| 170 | * Allocate @buffer->page if it hasn't been already, then | 170 | * Allocate @buffer->page if it hasn't been already, then |