Subject: [merged] sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table.patch removed from -mm tree To: joe@xxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 09 Jun 2014 12:39:48 -0700 The patch titled Subject: sysctl: convert use of typedef ctl_table to struct ctl_table has been removed from the -mm tree. Its filename was sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Joe Perches <joe@xxxxxxxxxxx> Subject: sysctl: convert use of typedef ctl_table to struct ctl_table This typedef is unnecessary and should just be removed. Signed-off-by: Joe Perches <joe@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sysctl.c | 2 +- kernel/utsname_sysctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN kernel/sysctl.c~sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table kernel/sysctl.c --- a/kernel/sysctl.c~sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table +++ a/kernel/sysctl.c @@ -202,7 +202,7 @@ static int proc_dostring_coredump(struct /* Note: sysrq code uses it's own private copy */ static int __sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE; -static int sysrq_sysctl_handler(ctl_table *table, int write, +static int sysrq_sysctl_handler(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { diff -puN kernel/utsname_sysctl.c~sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table kernel/utsname_sysctl.c --- a/kernel/utsname_sysctl.c~sysctl-convert-use-of-typedef-ctl_table-to-struct-ctl_table +++ a/kernel/utsname_sysctl.c @@ -17,7 +17,7 @@ #ifdef CONFIG_PROC_SYSCTL -static void *get_uts(ctl_table *table, int write) +static void *get_uts(struct ctl_table *table, int write) { char *which = table->data; struct uts_namespace *uts_ns; @@ -32,7 +32,7 @@ static void *get_uts(ctl_table *table, i return which; } -static void put_uts(ctl_table *table, int write, void *which) +static void put_uts(struct ctl_table *table, int write, void *which) { if (!write) up_read(&uts_sem); @@ -44,7 +44,7 @@ static void put_uts(ctl_table *table, in * Special case of dostring for the UTS structure. This has locks * to observe. Should this be in kernel/sys.c ???? */ -static int proc_do_uts_string(ctl_table *table, int write, +static int proc_do_uts_string(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { struct ctl_table uts_table; _ Patches currently in -mm which might be from joe@xxxxxxxxxxx are origin.patch checkpatch-check-git-commit-descriptions.patch mm-utilc-add-kstrimdup.patch fs-isofs-logging-clean-up.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html