s390/Kconfig: sort config S390 select list once again

[linux-2.6-microblaze.git] / include / linux / moduleparam.h

diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 6388eb9..eed280f 100644 (file)
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -21,12 +21,12 @@
 #define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
 
 #define __MODULE_INFO(tag, name, info)                                   \
-static const char __UNIQUE_ID(name)[]                                    \
-  __used __section(".modinfo") __attribute__((unused, aligned(1)))       \
-  = __MODULE_INFO_PREFIX __stringify(tag) "=" info
+       static const char __UNIQUE_ID(name)[]                             \
+               __used __section(".modinfo") __aligned(1)                 \
+               = __MODULE_INFO_PREFIX __stringify(tag) "=" info
 
 #define __MODULE_PARM_TYPE(name, _type)                                          \
-  __MODULE_INFO(parmtype, name##type, #name ":" _type)
+       __MODULE_INFO(parmtype, name##type, #name ":" _type)
 
 /* One for each parameter, describing how to use it.  Some files do
    multiple of these per line, so can't just use MODULE_INFO. */
@@ -288,8 +288,8 @@ struct kparam_array
        /* Default value instead of permissions? */                     \
        static const char __param_str_##name[] = prefix #name;          \
        static struct kernel_param __moduleparam_const __param_##name   \
-       __used                                                          \
-    __section("__param") __attribute__ ((unused, aligned(sizeof(void *)))) \
+       __used __section("__param")                                     \
+       __aligned(__alignof__(struct kernel_param))                     \
        = { __param_str_##name, THIS_MODULE, ops,                       \
            VERIFY_OCTAL_PERMISSIONS(perm), level, flags, { arg } }