diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-22 11:00:23 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-10-21 19:00:23 -0400 |
commit | 67e67ceaac5bf55dbdceb704ff2d763d438b5373 (patch) | |
tree | 59523536661c93dce7a02557ca6ac5827a7bf75f | |
parent | 9b473de87209fa86eb421b23386693b461612f30 (diff) |
core_param() for genuinely core kernel parameters
There are a lot of one-liner uses of __setup() in the kernel: they're
cumbersome and not queryable (definitely not settable) via /sys. Yet
it's ugly to simplify them to module_param(), because by default that
inserts a prefix of the module name (usually filename).
So, introduce a "core_param". The parameter gets no prefix, but
appears in /sys/module/kernel/parameters/ (if non-zero perms arg). I
thought about using the name "core", but that's more common than
"kernel". And if you create a module called "kernel", you will die
a horrible death.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | include/linux/moduleparam.h | 19 | ||||
-rw-r--r-- | kernel/params.c | 14 |
2 files changed, 26 insertions, 7 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index 1eefe6d61b86..e4af3399ef48 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h | |||
@@ -104,6 +104,25 @@ struct kparam_array | |||
104 | #define module_param(name, type, perm) \ | 104 | #define module_param(name, type, perm) \ |
105 | module_param_named(name, name, type, perm) | 105 | module_param_named(name, name, type, perm) |
106 | 106 | ||
107 | #ifndef MODULE | ||
108 | /** | ||
109 | * core_param - define a historical core kernel parameter. | ||
110 | * @name: the name of the cmdline and sysfs parameter (often the same as var) | ||
111 | * @var: the variable | ||
112 | * @type: the type (for param_set_##type and param_get_##type) | ||
113 | * @perm: visibility in sysfs | ||
114 | * | ||
115 | * core_param is just like module_param(), but cannot be modular and | ||
116 | * doesn't add a prefix (such as "printk."). This is for compatibility | ||
117 | * with __setup(), and it makes sense as truly core parameters aren't | ||
118 | * tied to the particular file they're in. | ||
119 | */ | ||
120 | #define core_param(name, var, type, perm) \ | ||
121 | param_check_##type(name, &(var)); \ | ||
122 | __module_param_call("", name, param_set_##type, param_get_##type, \ | ||
123 | &var, perm) | ||
124 | #endif /* !MODULE */ | ||
125 | |||
107 | /* Actually copy string: maxlen param is usually sizeof(string). */ | 126 | /* Actually copy string: maxlen param is usually sizeof(string). */ |
108 | #define module_param_string(name, string, len, perm) \ | 127 | #define module_param_string(name, string, len, perm) \ |
109 | static const struct kparam_string __param_string_##name \ | 128 | static const struct kparam_string __param_string_##name \ |
diff --git a/kernel/params.c b/kernel/params.c index f27c992a4625..b077f1b045d3 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -637,14 +637,14 @@ static void __init param_sysfs_builtin(void) | |||
637 | 637 | ||
638 | dot = strchr(kp->name, '.'); | 638 | dot = strchr(kp->name, '.'); |
639 | if (!dot) { | 639 | if (!dot) { |
640 | DEBUGP("couldn't find period in first %d characters " | 640 | /* This happens for core_param() */ |
641 | "of %s\n", MODULE_NAME_LEN, kp->name); | 641 | strcpy(modname, "kernel"); |
642 | continue; | 642 | name_len = 0; |
643 | } else { | ||
644 | name_len = dot - kp->name + 1; | ||
645 | strlcpy(modname, kp->name, name_len); | ||
643 | } | 646 | } |
644 | name_len = dot - kp->name; | 647 | kernel_add_sysfs_param(modname, kp, name_len); |
645 | strncpy(modname, kp->name, name_len); | ||
646 | modname[name_len] = '\0'; | ||
647 | kernel_add_sysfs_param(modname, kp, name_len+1); | ||
648 | } | 648 | } |
649 | } | 649 | } |
650 | 650 | ||