diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-22 14:32:04 -0400 |
| commit | 0e789314f8c0b50bd19bf08dc5624b9604d60183 (patch) | |
| tree | 64b6b9655e944284937f5eeff643f0754f35d0af /kernel/sysctl.c | |
| parent | f5dec51172b81db226a23f309bc737ad021af35b (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge commit 'v2.6.35-rc3' into for-linus
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 997080f00e0b..d24f761f4876 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1471,12 +1471,12 @@ static struct ctl_table fs_table[] = { | |||
| 1471 | }, | 1471 | }, |
| 1472 | #endif | 1472 | #endif |
| 1473 | { | 1473 | { |
| 1474 | .procname = "pipe-max-pages", | 1474 | .procname = "pipe-max-size", |
| 1475 | .data = &pipe_max_pages, | 1475 | .data = &pipe_max_size, |
| 1476 | .maxlen = sizeof(int), | 1476 | .maxlen = sizeof(int), |
| 1477 | .mode = 0644, | 1477 | .mode = 0644, |
| 1478 | .proc_handler = &proc_dointvec_minmax, | 1478 | .proc_handler = &pipe_proc_fn, |
| 1479 | .extra1 = &two, | 1479 | .extra1 = &pipe_min_size, |
| 1480 | }, | 1480 | }, |
| 1481 | /* | 1481 | /* |
| 1482 | * NOTE: do not add new entries to this table unless you have read | 1482 | * NOTE: do not add new entries to this table unless you have read |