Re: + sysctl-x86_64-remove-unnecessary-binary-paths.patch added to -mm tree

[Alexey Dobriyan <adobriyan@sw.ru>]

On Thu, Aug 09, 2007 at 06:42:01PM -0700, akpm@linux-foundation.org wrote:
> --- a/arch/x86_64/ia32/ia32_binfmt.c~sysctl-x86_64-remove-unnecessary-binary-paths
> +++ a/arch/x86_64/ia32/ia32_binfmt.c
> @@ -258,7 +258,6 @@ static void elf32_init(struct pt_regs *r
>  
>  static ctl_table abi_table2[] = {
>  	{
> -		.ctl_name	= 99,
>  		.procname	= "vsyscall32",
>  		.data		= &sysctl_vsyscall32,
>  		.maxlen		= sizeof(int),
> diff -puN arch/x86_64/kernel/vsyscall.c~sysctl-x86_64-remove-unnecessary-binary-paths arch/x86_64/kernel/vsyscall.c
> --- a/arch/x86_64/kernel/vsyscall.c~sysctl-x86_64-remove-unnecessary-binary-paths
> +++ a/arch/x86_64/kernel/vsyscall.c
> @@ -260,18 +260,10 @@ out:
>  	return ret;
>  }
>  
> -static int vsyscall_sysctl_nostrat(ctl_table *t, int __user *name, int nlen,
> -				void __user *oldval, size_t __user *oldlenp,
> -				void __user *newval, size_t newlen)
> -{
> -	return -ENOSYS;
> -}
> -
>  static ctl_table kernel_table2[] = {
> -	{ .ctl_name = 99, .procname = "vsyscall64",
> +	{ .procname = "vsyscall64",
>  	  .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
>  	  .mode = 0644,
> -	  .strategy = vsyscall_sysctl_nostrat,
>  	  .proc_handler = vsyscall_sysctl_change },

Looks good. It clearly newer worked.