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

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

[akpm]

The patch titled
     sysctl: x86_64 remove unnecessary binary paths
has been added to the -mm tree.  Its filename is
     sysctl-x86_64-remove-unnecessary-binary-paths.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: sysctl: x86_64 remove unnecessary binary paths
From: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Alexey Dobriyan <adobriyan@sw.ru>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86_64/ia32/ia32_binfmt.c |    1 -
 arch/x86_64/kernel/vsyscall.c  |   10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff -puN arch/x86_64/ia32/ia32_binfmt.c~sysctl-x86_64-remove-unnecessary-binary-paths arch/x86_64/ia32/ia32_binfmt.c
--- 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 },
 	{}
 };
_

Patches currently in -mm which might be from ebiederm@xmission.com are

remove-unused-struct-proc_dir_entryset.patch
dvb_en_50221-convert-to-kthread-api.patch
x86_64-remove-sync_arb_ids.patch
x86_64-clear-io_apic-before-enabing-apic-error-vector.patch
clone-flag-clone_parent_tidptr-leaves-invalid-results-in-memory.patch
handle-the-multi-threaded-inits-exit-properly.patch
sysctl-core-stop-using-the-unnecessary-ctl_table-typedef.patch
sysctl-factor-out-sysctl_data.patch
sysctl-error-on-bad-sysctl-tables.patch
sysctl-update-sysctl_check_table.patch
sysct-mqueue-remove-the-binary-sysctl-numbers.patch
sysctl-remove-binary-sysctl-support-where-it-clearly-doesnt-work.patch
sysctl-fix-neighbour-table-sysctls.patch
sysctl-ipv6-route-flushing-kill-binary-path.patch
sysctl-remove-broken-sunrpc-debug-binary-sysctls.patch
sysctl-x86_64-remove-unnecessary-binary-paths.patch
sysctl-remove-broken-cdrom-binary-sysctls.patch
sysctl-ipv4-remove-binary-sysctl-paths-where-they-are-broken.patch
sysctl-remove-the-binary-interface-for-aio-nr-aio-max-nr-acpi_video_flags.patch
cpuset-zero-malloc-revert-the-old-cpuset-fix.patch
task-containersv11-basic-task-container-framework.patch
task-containersv11-add-tasks-file-interface.patch
task-containersv11-add-fork-exit-hooks.patch
task-containersv11-add-container_clone-interface.patch
task-containersv11-add-procfs-interface.patch
task-containersv11-shared-container-subsystem-group-arrays.patch
task-containersv11-automatic-userspace-notification-of-idle-containers.patch
task-containersv11-make-cpusets-a-client-of-containers.patch
task-containersv11-example-cpu-accounting-subsystem.patch
task-containersv11-simple-task-container-debug-info-subsystem.patch
pid-namespaces-round-up-the-api.patch
pid-namespaces-make-get_pid_ns-return-the-namespace-itself.patch
pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces.patch
pid-namespaces-dynamic-kmem-cache-allocator-for-pid-namespaces-fix.patch
pid-namespaces-define-and-use-task_active_pid_ns-wrapper.patch
pid-namespaces-rename-child_reaper-function.patch
pid-namespaces-use-task_pid-to-find-leaders-pid.patch
pid-namespaces-define-is_global_init-and-is_container_init.patch
pid-namespaces-move-alloc_pid-to-copy_process.patch
make-access-to-tasks-nsproxy-lighter.patch

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

[Alexey Dobriyan]

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.