From b349c00a2f36f236f1f6972168113fafd658b152 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 26 Oct 2010 14:22:26 -0700 Subject: [PATCH] --- yaml --- r: 217513 b: refs/heads/master c: b6472776816af1ed52848c93d26e3edb3b17adab h: refs/heads/master i: 217511: 2a05f4ba7f4ab05d6337d8f7632dbbce483dd8ab v: v3 --- [refs] | 2 +- trunk/include/linux/moduleparam.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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