On Mon, 6 Jan 2014 16:08:46 -0800 Andi Kleen <andi@xxxxxxxxxxxxxx> wrote: > From: Andi Kleen <ak@xxxxxxxxxxxxxxx> > > [It turns out the documentation patch was already merged > earlier. So just resending without documentation.] Confused. How could we have merged the documentation for this feature but not the feature itself? > As discussed earlier, this adds a working sysctl to enable/disable > automatic numa memory balancing at runtime. > > This allows to track down performance problems with this > feature and is generally a good idea. > > This was possible earlier through debugfs, but only with special > debugging options set. Also fix the boot message. > > ... > > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -398,6 +398,15 @@ static struct ctl_table kern_table[] = { > .mode = 0644, > .proc_handler = proc_dointvec, > }, > + { > + .procname = "numa_balancing", > + .data = NULL, /* filled in by handler */ > + .maxlen = sizeof(unsigned int), > + .mode = 0644, > + .proc_handler = sched_numa_balancing, > + .extra1 = &zero, > + .extra2 = &one, > + }, The name "sched_numa_balancing" is wrong. All the other entries use "sysctl_numa_balancing_foo", and so should this one. --- a/include/linux/sched/sysctl.h~numa-add-a-sysctl-for-numa_balancing-fix +++ a/include/linux/sched/sysctl.h @@ -100,7 +100,7 @@ extern int sched_rt_handler(struct ctl_t void __user *buffer, size_t *lenp, loff_t *ppos); -extern int sched_numa_balancing(struct ctl_table *table, int write, +extern int sysctl_numa_balancing(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); --- a/kernel/sched/core.c~numa-add-a-sysctl-for-numa_balancing-fix +++ a/kernel/sched/core.c @@ -1766,7 +1766,7 @@ void set_numabalancing_state(bool enable #endif /* CONFIG_SCHED_DEBUG */ #ifdef CONFIG_PROC_SYSCTL -int sched_numa_balancing(struct ctl_table *table, int write, +int sysctl_numa_balancing(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { struct ctl_table t; --- a/kernel/sysctl.c~numa-add-a-sysctl-for-numa_balancing-fix +++ a/kernel/sysctl.c @@ -401,7 +401,7 @@ static struct ctl_table kern_table[] = { .data = NULL, /* filled in by handler */ .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = sched_numa_balancing, + .proc_handler = sysctl_numa_balancing, .extra1 = &zero, .extra2 = &one, }, _ -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>