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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140130014914.GC9804@tassilo.jf.intel.com>
Date:	Wed, 29 Jan 2014 17:49:14 -0800
From:	Andi Kleen <ak@...ux.intel.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andrew Morton <akpm@...ux-foundation.org>,
	Rik van Riel <riel@...hat.com>
Subject: Re: linux-next: manual merge of the tip tree with Linus' tree

> 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                    sfr@...b.auug.org.au
> 
> 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 */
>   	{



-- 
ak@...ux.intel.com -- Speaking for myself only
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/