mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 16:48:26 +02:00 
			
		
		
		
	 cdd30ebb1b
			
		
	
	
		cdd30ebb1b
		
	
	
	
	
		
			
			Clean up the existing export namespace code along the same lines of
commit 33def8498f ("treewide: Convert macro and uses of __section(foo)
to __section("foo")") and for the same reason, it is not desired for the
namespace argument to be a macro expansion itself.
Scripted using
  git grep -l -e MODULE_IMPORT_NS -e EXPORT_SYMBOL_NS | while read file;
  do
    awk -i inplace '
      /^#define EXPORT_SYMBOL_NS/ {
        gsub(/__stringify\(ns\)/, "ns");
        print;
        next;
      }
      /^#define MODULE_IMPORT_NS/ {
        gsub(/__stringify\(ns\)/, "ns");
        print;
        next;
      }
      /MODULE_IMPORT_NS/ {
        $0 = gensub(/MODULE_IMPORT_NS\(([^)]*)\)/, "MODULE_IMPORT_NS(\"\\1\")", "g");
      }
      /EXPORT_SYMBOL_NS/ {
        if ($0 ~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+),/) {
  	if ($0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/ &&
  	    $0 !~ /(EXPORT_SYMBOL_NS[^(]*)\(\)/ &&
  	    $0 !~ /^my/) {
  	  getline line;
  	  gsub(/[[:space:]]*\\$/, "");
  	  gsub(/[[:space:]]/, "", line);
  	  $0 = $0 " " line;
  	}
  	$0 = gensub(/(EXPORT_SYMBOL_NS[^(]*)\(([^,]+), ([^)]+)\)/,
  		    "\\1(\\2, \"\\3\")", "g");
        }
      }
      { print }' $file;
  done
Requested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://mail.google.com/mail/u/2/#inbox/FMfcgzQXKWgMmjdFwwdsfgxzKpVHWPlc
Acked-by: Greg KH <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
	
			
		
			
				
	
	
		
			68 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			68 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| // SPDX-License-Identifier: GPL-2.0
 | |
| 
 | |
| #include <linux/types.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/sysctl.h>
 | |
| 
 | |
| #include "fallback.h"
 | |
| #include "firmware.h"
 | |
| 
 | |
| /*
 | |
|  * firmware fallback configuration table
 | |
|  */
 | |
| 
 | |
| struct firmware_fallback_config fw_fallback_config = {
 | |
| 	.force_sysfs_fallback = IS_ENABLED(CONFIG_FW_LOADER_USER_HELPER_FALLBACK),
 | |
| 	.loading_timeout = 60,
 | |
| 	.old_timeout = 60,
 | |
| };
 | |
| EXPORT_SYMBOL_NS_GPL(fw_fallback_config, "FIRMWARE_LOADER_PRIVATE");
 | |
| 
 | |
| #ifdef CONFIG_SYSCTL
 | |
| static struct ctl_table firmware_config_table[] = {
 | |
| 	{
 | |
| 		.procname	= "force_sysfs_fallback",
 | |
| 		.data		= &fw_fallback_config.force_sysfs_fallback,
 | |
| 		.maxlen         = sizeof(unsigned int),
 | |
| 		.mode           = 0644,
 | |
| 		.proc_handler   = proc_douintvec_minmax,
 | |
| 		.extra1		= SYSCTL_ZERO,
 | |
| 		.extra2		= SYSCTL_ONE,
 | |
| 	},
 | |
| 	{
 | |
| 		.procname	= "ignore_sysfs_fallback",
 | |
| 		.data		= &fw_fallback_config.ignore_sysfs_fallback,
 | |
| 		.maxlen         = sizeof(unsigned int),
 | |
| 		.mode           = 0644,
 | |
| 		.proc_handler   = proc_douintvec_minmax,
 | |
| 		.extra1		= SYSCTL_ZERO,
 | |
| 		.extra2		= SYSCTL_ONE,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| 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 */
 |