diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-08-22 19:54:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-08-22 19:54:01 -0700 |
| commit | 9c46b04a4e3ecec0e96a188c5e68c10c8dd769d3 (patch) | |
| tree | 3312420dac83ed36178a171c691e21aace0af929 /kernel | |
| parent | 14729dbe26e736a6cc5479d3acb9e288b56a9a1b (diff) | |
| parent | b289a4b7b91abf6712f751da1694ffff9eb9dbe0 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 13 | ||||
| -rw-r--r-- | kernel/params.c | 3 |
2 files changed, 3 insertions, 13 deletions
diff --git a/kernel/module.c b/kernel/module.c index dfe295ecf2f1..aa91a98ffb0b 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -725,19 +725,6 @@ static inline int sysfs_unload_setup(struct module *mod) #endif /* CONFIG_MODULE_UNLOAD */ #ifdef CONFIG_OBSOLETE_MODPARM -static int param_set_byte(const char *val, struct kernel_param *kp) -{ - char *endp; - long l; - - if (!val) return -EINVAL; - l = simple_strtol(val, &endp, 0); - if (endp == val || *endp || ((char)l != l)) - return -EINVAL; - *((char *)kp->arg) = l; - return 0; -} - /* Bounds checking done below */ static int obsparm_copy_string(const char *val, struct kernel_param *kp) { diff --git a/kernel/params.c b/kernel/params.c index 5f38ee74a637..df5407c821ad 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -171,6 +171,7 @@ int parse_args(const char *name, return sprintf(buffer, format, *((type *)kp->arg)); \ } +STANDARD_PARAM_DEF(byte, unsigned char, "%c", unsigned long, simple_strtoul); STANDARD_PARAM_DEF(short, short, "%hi", long, simple_strtol); STANDARD_PARAM_DEF(ushort, unsigned short, "%hu", unsigned long, simple_strtoul); STANDARD_PARAM_DEF(int, int, "%i", long, simple_strtol); @@ -339,6 +340,8 @@ int param_set_copystring(const char *val, struct kernel_param *kp) return 0; } +EXPORT_SYMBOL(param_set_byte); +EXPORT_SYMBOL(param_get_byte); EXPORT_SYMBOL(param_set_short); EXPORT_SYMBOL(param_get_short); EXPORT_SYMBOL(param_set_ushort); |