diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /kernel/sysctl.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 79dbd93bd697..701d12c63068 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1991,6 +1991,8 @@ int proc_dointvec_userhz_jiffies(ctl_table *table, int write, struct file *filp, | |||
| 1991 | * @filp: the file structure | 1991 | * @filp: the file structure |
| 1992 | * @buffer: the user buffer | 1992 | * @buffer: the user buffer |
| 1993 | * @lenp: the size of the user buffer | 1993 | * @lenp: the size of the user buffer |
| 1994 | * @ppos: file position | ||
| 1995 | * @ppos: the current position in the file | ||
| 1994 | * | 1996 | * |
| 1995 | * Reads/writes up to table->maxlen/sizeof(unsigned int) integer | 1997 | * Reads/writes up to table->maxlen/sizeof(unsigned int) integer |
| 1996 | * values from/to the user buffer, treated as an ASCII string. | 1998 | * values from/to the user buffer, treated as an ASCII string. |