vserver 1.9.3

[linux-2.6.git] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index e9d6a16..7a145cd 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -50,7 +50,7 @@ struct kparam_array
    not there, read bits mean it's readable, write bits mean it's
    writable. */
 #define __module_param_call(prefix, name, set, get, arg, perm)         \
-       static char __param_str_##name[] __initdata = prefix #name;     \
+       static char __param_str_##name[] = prefix #name;                \
        static struct kernel_param const __param_##name                 \
        __attribute_used__                                              \
     __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \
@@ -71,9 +71,9 @@ struct kparam_array
 
 /* Actually copy string: maxlen param is usually sizeof(string). */
 #define module_param_string(name, string, len, perm)                   \
-       static struct kparam_string __param_string_##name __initdata    \
+       static struct kparam_string __param_string_##name               \
                = { len, string };                                      \
-       module_param_call(name, param_set_copystring, param_get_charp,  \
+       module_param_call(name, param_set_copystring, param_get_string, \
                   &__param_string_##name, perm)
 
 /* Called on module insert or kernel boot */
@@ -89,6 +89,10 @@ extern int parse_args(const char *name,
 #define __param_check(name, p, type) \
        static inline type *__check_##name(void) { return(p); }
 
+extern int param_set_byte(const char *val, struct kernel_param *kp);
+extern int param_get_byte(char *buffer, struct kernel_param *kp);
+#define param_check_byte(name, p) __param_check(name, p, unsigned char)
+
 extern int param_set_short(const char *val, struct kernel_param *kp);
 extern int param_get_short(char *buffer, struct kernel_param *kp);
 #define param_check_short(name, p) __param_check(name, p, short)
@@ -140,6 +144,7 @@ extern int param_array_set(const char *val, struct kernel_param *kp);
 extern int param_array_get(char *buffer, struct kernel_param *kp);
 
 extern int param_set_copystring(const char *val, struct kernel_param *kp);
+extern int param_get_string(char *buffer, struct kernel_param *kp);
 
 int param_array(const char *name,
                const char *val,
@@ -147,4 +152,4 @@ int param_array(const char *name,
                void *elem, int elemsize,
                int (*set)(const char *, struct kernel_param *kp),
                int *num);
-#endif /* _LINUX_MODULE_PARAM_TYPES_H */
+#endif /* _LINUX_MODULE_PARAMS_H */