diff --git a/[refs] b/[refs] index e1af0947b90d..54fa7e7b47ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a55621f15bc61826969a29e111ba131a55ef45de +refs/heads/master: b6472776816af1ed52848c93d26e3edb3b17adab diff --git a/trunk/include/linux/moduleparam.h b/trunk/include/linux/moduleparam.h index 9d2f1837b3d8..112adf8bd47d 100644 --- a/trunk/include/linux/moduleparam.h +++ b/trunk/include/linux/moduleparam.h @@ -21,8 +21,8 @@ #define __module_cat(a,b) ___module_cat(a,b) #define __MODULE_INFO(tag, name, info) \ static const char __module_cat(name,__LINE__)[] \ - __used \ - __attribute__((section(".modinfo"),unused)) = __stringify(tag) "=" info + __used __attribute__((section(".modinfo"), unused, aligned(1))) \ + = __stringify(tag) "=" info #else /* !MODULE */ #define __MODULE_INFO(tag, name, info) #endif