summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 16:15:18 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2008-12-01 16:15:18 +1100
commitf388e00a257652f638232e9049d6f3408e0333c2 (patch)
tree371a3df9df67d60e272b1800f2978bdf18851c20 /kernel
parent4a53628a5b001191c0874fc4107458b1e94c8a59 (diff)
parent00f39605364d5d04d669c7c280d8645efee3aa51 (diff)
Merge commit 'slab/for-next'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 65d4a9ba79e4..348026447a22 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1088,6 +1088,26 @@ static struct ctl_table vm_table[] = {
.strategy = &sysctl_intvec,
.extra1 = &zero,
},
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "slab_defrag_limit",
+ .data = &slab_defrag_limit,
+ .maxlen = sizeof(slab_defrag_limit),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec,
+ .strategy = &sysctl_intvec,
+ .extra1 = &one_hundred,
+ },
+ {
+ .ctl_name = CTL_UNNUMBERED,
+ .procname = "slab_defrag_count",
+ .data = &slab_defrag_counter,
+ .maxlen = sizeof(slab_defrag_counter),
+ .mode = 0444,
+ .proc_handler = &proc_dointvec,
+ .strategy = &sysctl_intvec,
+ .extra1 = &zero,
+ },
#ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
{
.ctl_name = VM_LEGACY_VA_LAYOUT,