Re: [kbuild 4/5] Include type information as module info wherepossible

[Andreas Gruenbacher]

Hello,

MODULE_PARM_TYPE needs to be moved to moduleparam.h: several files
include moduleparam.h but not module.h.

Regards,
-- 
Andreas Gruenbacher <agruen@xxxxxxx>
SUSE Labs, SUSE LINUX GMBH
> --- Begin Message ---
> Module parameters no longer have a type in general, as we use a callback
> system (module_param_call()).  However, it's useful to include type
> information in the commonly-used wrappers: module_param,
> module_param_string and module_param_array.
>
> This adds a parmtype modinfo tag for each parameter defined using
> module_param() or MODULE_PARM(). This allows modinfo to easily print all
> parameters and their types, independent of whether or not the parameter
> has a description (MODULE_PARM_DESC()).
>
> Originally-signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
> Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx>
>
> Index: linux-2.6.11-rc1-bk6/include/linux/moduleparam.h
> ===================================================================
> --- linux-2.6.11-rc1-bk6.orig/include/linux/moduleparam.h
> +++ linux-2.6.11-rc1-bk6/include/linux/moduleparam.h
> @@ -13,6 +13,10 @@
>  #define MODULE_PARAM_PREFIX __stringify(KBUILD_MODNAME) "."
>  #endif
>  
> +/* Type information for a module parameter. */
> +#define MODULE_PARM_TYPE(name, _type) \
> +	__MODULE_INFO(parmtype, name##type, #name ":" _type)
> +
>  struct kernel_param;
>  
>  /* Returns 0, or -errno.  arg is in kp->arg. */
> @@ -64,7 +68,8 @@ struct kparam_array
>     param_set_XXX and param_check_XXX. */
>  #define module_param_named(name, value, type, perm)			   \
>  	param_check_##type(name, &(value));				   \
> -	module_param_call(name, param_set_##type, param_get_##type, &value, perm)
> +	module_param_call(name, param_set_##type, param_get_##type, &value, perm); \
> +	MODULE_PARM_TYPE(name, #type)
>  
>  #define module_param(name, type, perm)				\
>  	module_param_named(name, name, type, perm)
> @@ -74,7 +79,8 @@ struct kparam_array
>  	static struct kparam_string __param_string_##name		\
>  		= { len, string };					\
>  	module_param_call(name, param_set_copystring, param_get_string,	\
> -		   &__param_string_##name, perm)
> +		   &__param_string_##name, perm);			\
> +	MODULE_PARM_TYPE(name, "string")
>  
>  /* Called on module insert or kernel boot */
>  extern int parse_args(const char *name,
> @@ -135,7 +141,8 @@ extern int param_get_invbool(char *buffe
>  	= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
>  	    sizeof(array[0]), array };					\
>  	module_param_call(name, param_array_set, param_array_get, 	\
> -			  &__param_arr_##name, perm)
> +			  &__param_arr_##name, perm);			\
> +	MODULE_PARM_TYPE(name, "array of " #type)
>  
>  #define module_param_array(name, type, nump, perm)		\
>  	module_param_array_named(name, name, type, nump, perm)
> Index: linux-2.6.11-rc1-bk6/include/linux/module.h
> ===================================================================
> --- linux-2.6.11-rc1-bk6.orig/include/linux/module.h
> +++ linux-2.6.11-rc1-bk6/include/linux/module.h
> @@ -560,7 +560,8 @@ static inline void MODULE_PARM_(void) { 
>  /* DEPRECATED: Do not use. */
>  #define MODULE_PARM(var,type)						    \
>  struct obsolete_modparm __parm_##var __attribute__((section("__obsparm"))) = \
> -{ __stringify(var), type, &MODULE_PARM_ };
> +{ __stringify(var), type, &MODULE_PARM_ }; \
> +MODULE_PARM_TYPE(var, type);
>  #else
>  #define MODULE_PARM(var,type) static void __attribute__((__unused__)) *__parm_##var = &MODULE_PARM_;
>  #endif
>
> --- End Message ---