diff --git a/[refs] b/[refs] index abc771fcf9ce..7b3c3e375bff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d9b48ea81ee49779b95ecd0df5a8c2789e4f836 +refs/heads/master: 350f82586b7554240bee18c41cc5c842f63265ae diff --git a/trunk/kernel/params.c b/trunk/kernel/params.c index cf1b69183127..2278ce244cf8 100644 --- a/trunk/kernel/params.c +++ b/trunk/kernel/params.c @@ -402,8 +402,8 @@ int param_get_string(char *buffer, struct kernel_param *kp) } /* sysfs output in /sys/modules/XYZ/parameters/ */ -#define to_module_attr(n) container_of(n, struct module_attribute, attr); -#define to_module_kobject(n) container_of(n, struct module_kobject, kobj); +#define to_module_attr(n) container_of(n, struct module_attribute, attr) +#define to_module_kobject(n) container_of(n, struct module_kobject, kobj) extern struct kernel_param __start___param[], __stop___param[]; @@ -421,7 +421,7 @@ struct module_param_attrs }; #ifdef CONFIG_SYSFS -#define to_param_attr(n) container_of(n, struct param_attribute, mattr); +#define to_param_attr(n) container_of(n, struct param_attribute, mattr) static ssize_t param_attr_show(struct module_attribute *mattr, struct module *mod, char *buf)