diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 11:46:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-04-07 11:46:23 -0400 |
| commit | 5f63e885ac32429fc1340f5a61e1484022efc773 (patch) | |
| tree | f9a21a6902e1857274775b96d561d8be17287860 /kernel/sysctl.c | |
| parent | b6d2d3289f84e9c7449dff04fb959e29207acd80 (diff) | |
| parent | f22e6e847115abc3a0e2ad7bb18d243d42275af1 (diff) | |
Merge tag 'v4.0-rc7' into next
Sync up with Linux 4.0-rc7 to bring in ALPS changes.
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 88ea2d6e0031..ce410bb9f2e1 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
| @@ -1228,6 +1228,14 @@ static struct ctl_table vm_table[] = { | |||
| 1228 | .extra1 = &zero, | 1228 | .extra1 = &zero, |
| 1229 | }, | 1229 | }, |
| 1230 | { | 1230 | { |
| 1231 | .procname = "dirtytime_expire_seconds", | ||
| 1232 | .data = &dirtytime_expire_interval, | ||
| 1233 | .maxlen = sizeof(dirty_expire_interval), | ||
| 1234 | .mode = 0644, | ||
| 1235 | .proc_handler = dirtytime_interval_handler, | ||
| 1236 | .extra1 = &zero, | ||
| 1237 | }, | ||
| 1238 | { | ||
| 1231 | .procname = "nr_pdflush_threads", | 1239 | .procname = "nr_pdflush_threads", |
| 1232 | .mode = 0444 /* read-only */, | 1240 | .mode = 0444 /* read-only */, |
| 1233 | .proc_handler = pdflush_proc_obsolete, | 1241 | .proc_handler = pdflush_proc_obsolete, |