]> Pileus Git - ~andy/linux/commitdiff
module_param: check that bool parameters really are bool.
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 12 Jan 2012 23:02:28 +0000 (09:32 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 12 Jan 2012 23:02:28 +0000 (09:32 +1030)
module_param(bool) used to counter-intuitively take an int.  In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.

This tightens the check (you'll get a warning about incompatible
return type) but still allows it.  Next kernel version, we'll remove
it.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
include/linux/moduleparam.h

index 6bdde0c3bcca4724f1e27f545dd611eda51b996e..c47f4d60db0b0fb6cd05668212768efc439dc61d 100644 (file)
@@ -350,17 +350,11 @@ extern int param_set_charp(const char *val, const struct kernel_param *kp);
 extern int param_get_charp(char *buffer, const struct kernel_param *kp);
 #define param_check_charp(name, p) __param_check(name, p, char *)
 
-/* For historical reasons "bool" parameters can be (unsigned) "int". */
+/* We used to allow int as well as bool.  We're taking that away! */
 extern struct kernel_param_ops param_ops_bool;
 extern int param_set_bool(const char *val, const struct kernel_param *kp);
 extern int param_get_bool(char *buffer, const struct kernel_param *kp);
-#define param_check_bool(name, p)                                      \
-       static inline void __check_##name(void)                         \
-       {                                                               \
-               BUILD_BUG_ON(!__same_type((p), bool *) &&               \
-                            !__same_type((p), unsigned int *) &&       \
-                            !__same_type((p), int *));                 \
-       }
+#define param_check_bool(name, p) __param_check(name, p, bool)
 
 extern struct kernel_param_ops param_ops_invbool;
 extern int param_set_invbool(const char *val, const struct kernel_param *kp);