x86/entry: Move PUSH_AND_CLEAR_REGS out of error_entry()

[linux.git] / drivers / base / firmware_loader / fallback_table.c

diff --git a/drivers/base/firmware_loader/fallback_table.c b/drivers/base/firmware_loader/fallback_table.c
index 46a731dede6f7a08b6e7c0f6d2a6cad0664a7d33..e5ac098d0742a0bdd37a3426ea6f250b7a47b40a 100644 (file)
--- a/drivers/base/firmware_loader/fallback_table.c
+++ b/drivers/base/firmware_loader/fallback_table.c
@@ -4,6 +4,7 @@
 #include <linux/kconfig.h>
 #include <linux/list.h>
 #include <linux/slab.h>
 #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>
 #include <linux/security.h>
 #include <linux/highmem.h>
 #include <linux/umh.h>


@@ -24,7 +25,7 @@ struct firmware_fallback_config fw_fallback_config = {
 EXPORT_SYMBOL_NS_GPL(fw_fallback_config, FIRMWARE_LOADER_PRIVATE);
 
 #ifdef CONFIG_SYSCTL
 EXPORT_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,
        {
                .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 */