firmware_loader-move-firmware-sysctl-to-its-own-files.patch removed from -mm tree
The patch titled
Subject: firmware_loader: move firmware sysctl to its own files
has been removed from the -mm tree. Its filename was
firmware_loader-move-firmware-sysctl-to-its-own-files.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Xiaoming Ni <[email protected]>
Subject: firmware_loader: move firmware sysctl to its own files
Patch series "sysctl: 3rd set of kernel/sysctl cleanups", v2.
This is the third set of patches to help address cleaning the kitchen seink in kernel/sysctl.c and to move sysctls away to where they are actually implemented / used.
This patch (of 8):
kernel/sysctl.c is a kitchen sink where everyone leaves their dirty dishes, this makes it very difficult to maintain.
To help with this maintenance let's start by moving sysctls to places where they actually belong. The proc sysctl maintainers do not want to know what sysctl knobs you wish to add for your own piece of code, we just care about the core logic.
So move the firmware configuration sysctl table to the only place where it is used, and make it clear that if sysctls are disabled this is not used.
---
drivers/base/firmware_loader/fallback.c | 7 +++- drivers/base/firmware_loader/fallback.h | 11 +++++++ drivers/base/firmware_loader/fallback_table.c | 25 ++++++++++++++-- include/linux/sysctl.h | 1 kernel/sysctl.c | 7 ---- 5 files changed, 40 insertions(+), 11 deletions(-)
drivers/base/firmware_loader/fallback.c renamed from drivers/base/firmware_loader/fallback.c~firmware_loader-move-firmware-sysctl-to-its-own-files +6 -1
@@ -199,11 +199,16 @@ static struct class firmware_class = {int register_sysfs_loader (void ) { -return class_register (&firmware_class); +int ret =class_register (&firmware_class); + +if (ret !=0 ) +return ret; +return register_firmware_config_sysctl (); }void unregister_sysfs_loader (void ) { +unregister_firmware_config_sysctl ();class_unregister (&firmware_class); }
drivers/base/firmware_loader/fallback.h renamed from drivers/base/firmware_loader/fallback.h~firmware_loader-move-firmware-sysctl-to-its-own-files +11 -0
@@ -42,6 +42,17 @@ void fw_fallback_set_default_timeout(voiint register_sysfs_loader (void );void unregister_sysfs_loader (void ); +#ifdef CONFIG_SYSCTL +extern int register_firmware_config_sysctl (void ); +extern void unregister_firmware_config_sysctl (void ); +#else +static inline int register_firmware_config_sysctl (void ) +{ +return 0 ; +} +static inline void unregister_firmware_config_sysctl (void ) { } +#endif /* CONFIG_SYSCTL */ +#else /* CONFIG_FW_LOADER_USER_HELPER */ static inline int firmware_fallback_sysfs(struct firmware *fw, const char *name, struct device *device,
drivers/base/firmware_loader/fallback_table.c renamed from drivers/base/firmware_loader/fallback_table.c~firmware_loader-move-firmware-sysctl-to-its-own-files +23 -2
@@ -4,6 +4,7 @@#include <linux/kconfig.h> #include <linux/list.h> #include <linux/slab.h> +#include <linux/export.h> #include <linux/security.h> #include <linux/highmem.h> #include <linux/umh.h>
@@ -24,7 +25,7 @@ struct firmware_fallback_config fw_fallbEXPORT_SYMBOL_NS_GPL (fw_fallback_config,FIRMWARE_LOADER_PRIVATE ); #ifdef CONFIG_SYSCTL -struct ctl_table firmware_config_table[] = { +static struct ctl_table firmware_config_table[] = { { .procname = "force_sysfs_fallback", .data = &fw_fallback_config.force_sysfs_fallback,
@@ -45,4 +46,24 @@ struct ctl_table firmware_config_table[] }, { } }; -#endif + +static struct ctl_table_header *firmware_config_sysct_table_header; +int register_firmware_config_sysctl (void ) +{ + firmware_config_sysct_table_header = +register_sysctl ("kernel/firmware_config" , + firmware_config_table); +if (!firmware_config_sysct_table_header) +return -ENOMEM ; +return 0 ; +} +EXPORT_SYMBOL_NS_GPL (register_firmware_config_sysctl,FIRMWARE_LOADER_PRIVATE ); + +void unregister_firmware_config_sysctl (void ) +{ +unregister_sysctl_table (firmware_config_sysct_table_header); + firmware_config_sysct_table_header =NULL ; +} +EXPORT_SYMBOL_NS_GPL (unregister_firmware_config_sysctl,FIRMWARE_LOADER_PRIVATE ); + +#endif /* CONFIG_SYSCTL */
include/linux/sysctl.h renamed from include/linux/sysctl.h~firmware_loader-move-firmware-sysctl-to-its-own-files +0 -1
@@ -218,7 +218,6 @@ extern int no_unaligned_warning;extern struct ctl_table sysctl_mount_point[];extern struct ctl_table random_table[]; -extern struct ctl_table firmware_config_table[];#else /* CONFIG_SYSCTL */ static inline struct ctl_table_header *register_sysctl_table (struct ctl_table * table)
kernel/sysctl.c renamed from kernel/sysctl.c~firmware_loader-move-firmware-sysctl-to-its-own-files +0 -7
@@ -2154,13 +2154,6 @@ static struct ctl_table kern_table[] = { .mode = 0555, .child = usermodehelper_table, }, -#ifdef CONFIG_FW_LOADER_USER_HELPER - { - .procname = "firmware_config", - .mode = 0555, - .child = firmware_config_table, - }, -#endif { .procname = "overflowuid", .data = &overflowuid,
_
Patches currently in -mm which might be from [email protected] are