diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 16:07:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-15 16:07:17 -0800 |
| commit | 51cbfa046abf819c725fb29ef3b9bba8bcc47da7 (patch) | |
| tree | f001ee01717422715dfee7f07db7cb854eaef4ce /include/linux/moduleparam.h | |
| parent | 1b2ed5b74904b6d1540efdd0bd08022765dc292a (diff) | |
| parent | 9c930c3fb6065c70380966898b276259fdcbae8b (diff) | |
Merge bk://kernel.bkbits.net/vojtech/input
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/moduleparam.h')
| -rw-r--r-- | include/linux/moduleparam.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h index cbca00722b5c..e9d6a16d3fef 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -126,13 +126,16 @@ extern int param_get_invbool(char *buffer, struct kernel_param *kp); #define param_check_invbool(name, p) __param_check(name, p, int) /* Comma-separated array: num is set to number they actually specified. */ -#define module_param_array(name, type, num, perm) \ +#define module_param_array_named(name, array, type, num, perm) \ static struct kparam_array __param_arr_##name \ - = { ARRAY_SIZE(name), &num, param_set_##type, param_get_##type, \ - sizeof(name[0]), name }; \ + = { ARRAY_SIZE(array), &num, param_set_##type, param_get_##type,\ + sizeof(array[0]), array }; \ module_param_call(name, param_array_set, param_array_get, \ &__param_arr_##name, perm) +#define module_param_array(name, type, num, perm) \ + module_param_array_named(name, name, type, num, perm) + extern int param_array_set(const char *val, struct kernel_param *kp); extern int param_array_get(char *buffer, struct kernel_param *kp); |