Subject: Re: linux-next: manual merge of the tip tree with Linus' tree

From: Andi Kleen <[email-masked]>
Date: Wed, 29 Jan 2014 17:49:14 -0800

> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

I don't think the fix is correct, both sysctls need to be kept. They
do different things.

-Andi

> 
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> 
> diff --cc kernel/sysctl.c
> index 096db7452cbd,2a4a4fc89cd1..000000000000
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@@ -383,22 -386,6 +385,15 @@@ static struct ctl_table kern_table[] = 
>   		.mode		= 0644,
>   		.proc_handler	= proc_dointvec,
>   	},
>  +	{
> - 		.procname       = "numa_balancing_migrate_deferred",
> - 		.data           = &sysctl_numa_balancing_migrate_deferred,
> - 		.maxlen         = sizeof(unsigned int),
> - 		.mode           = 0644,
> - 		.proc_handler   = proc_dointvec,
> - 	},
> - 	{
>  +		.procname	= "numa_balancing",
>  +		.data		= NULL, /* filled in by handler */
>  +		.maxlen		= sizeof(unsigned int),
>  +		.mode		= 0644,
>  +		.proc_handler	= sysctl_numa_balancing,
>  +		.extra1		= &zero,
>  +		.extra2		= &one,
>  +	},
>   #endif /* CONFIG_NUMA_BALANCING */
>   #endif /* CONFIG_SCHED_DEBUG */
>   	{

-- 
[email-masked] -- Speaking for myself only