From ab54650aefdb90b359489098b7702b9785883d95 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 13 Jan 2012 09:32:28 +1030 Subject: [PATCH] --- yaml --- r: 284670 b: refs/heads/master c: 72db395ffadb1d33233fd123c2bf87ba0198c6c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/moduleparam.h | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 0972b7ef766d..07a63e46c156 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6e02554c1036f8c62080ecf4702703427c651a4 +refs/heads/master: 72db395ffadb1d33233fd123c2bf87ba0198c6c1 diff --git a/trunk/include/linux/moduleparam.h b/trunk/include/linux/moduleparam.h index 6bdde0c3bcca..c47f4d60db0b 100644 --- a/trunk/include/linux/moduleparam.h +++ b/trunk/include/linux/moduleparam.h @@ -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);