kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases.patch removed from -mm tree
The patch titled
Subject: kernel/sysctl.c: rename sysctl_init() to sysctl_init_bases()
has been removed from the -mm tree. Its filename was
kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Luis Chamberlain <[email protected]>
Subject: kernel/sysctl.c: rename sysctl_init() to sysctl_init_bases()
Rename sysctl_init() to sysctl_init_bases() so to reflect exactly what this is doing.
Signed-off-by Luis Chamberlain <[email protected]>
Cc Al Viro <[email protected]>
Cc Anil S Keshavamurthy <[email protected]>
Cc Antti Palosaari <[email protected]>
Cc Christian Brauner <[email protected]>
Cc "David S. Miller" <[email protected]>
Cc Eric Biederman <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Iurii Zaikin <[email protected]>
Cc Kees Cook <[email protected]>
Cc Lukas Middendorf <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc "Naveen N. Rao" <[email protected]>
Cc Stephen Kitt <[email protected]>
Cc Xiaoming Ni <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm/mm/alignment.c | 2 +- arch/sh/mm/alignment.c | 2 +- fs/proc/proc_sysctl.c | 4 ++-- include/linux/sysctl.h | 2 +- kernel/sysctl.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mm/alignment.c renamed from arch/arm/mm/alignment.c~kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases +1 -1
@@ -1005,7 +1005,7 @@ static int __init noalign_setup(char *____setup ("noalign" , noalign_setup);/* -* This needs to be done after sysctl_init, otherwise sys/ will be +* This needs to be done after sysctl_init_bases(), otherwise sys/ will be * overwritten. Actually, this shouldn't be in sys/ at all since * it isn't a sysctl, and it doesn't contain sysctl information. * We now locate it in /proc/cpu/alignment instead.
arch/sh/mm/alignment.c renamed from arch/sh/mm/alignment.c~kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases +1 -1
@@ -161,7 +161,7 @@ static const struct proc_ops alignment_p };/* -* This needs to be done after sysctl_init, otherwise sys/ will be +* This needs to be done after sysctl_init_bases(), otherwise sys/ will be * overwritten. Actually, this shouldn't be in sys/ at all since * it isn't a sysctl, and it doesn't contain sysctl information. * We now locate it in /proc/cpu/alignment instead.
fs/proc/proc_sysctl.c renamed from fs/proc/proc_sysctl.c~kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases +2 -2
@@ -1419,7 +1419,7 @@ EXPORT_SYMBOL(register_sysctl);* Context: Can only be called after your respective sysctl base path has been * registered. So for instance, most base directories are registered early on * init before init levels are processed through proc_sys_init() and -* sysctl_init(). +* sysctl_init_bases(). */ void __init __register_sysctl_init (const char *path,struct ctl_table *table,const char *table_name)
@@ -1768,7 +1768,7 @@ int __init proc_sys_init(void) proc_sys_root->proc_dir_ops = &proc_sys_dir_file_operations; proc_sys_root->nlink =0 ; -return sysctl_init (); +return sysctl_init_bases (); }struct sysctl_alias {
include/linux/sysctl.h renamed from include/linux/sysctl.h~kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases +1 -1
@@ -228,7 +228,7 @@ struct ctl_table_header *register_sysctlvoid unregister_sysctl_table (struct ctl_table_header * table); -extern int sysctl_init (void ); +extern int sysctl_init_bases (void );extern void __register_sysctl_init (const char *path,struct ctl_table *table,const char *table_name);#define register_sysctl_init (path, table) __register_sysctl_init(path, table, #table)
kernel/sysctl.c renamed from kernel/sysctl.c~kernel-sysctlc-rename-sysctl_init-to-sysctl_init_bases +1 -1
@@ -2844,7 +2844,7 @@ DECLARE_SYSCTL_BASE(vm, vm_table);DECLARE_SYSCTL_BASE (debug, debug_table);DECLARE_SYSCTL_BASE (dev, dev_table); -int __init sysctl_init (void ) +int __init sysctl_init_bases (void ) {register_sysctl_base (kernel);register_sysctl_base (vm);
_
Patches currently in -mm which might be from [email protected] are