summaryrefslogtreecommitdiffstats
path: root/include/linux/moduleparam.h
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2020-10-29 14:08:40 -0700
committerJakub Kicinski <kuba@kernel.org>2020-10-29 14:08:40 -0700
commit1c29d9899081d090cbe2aab128e527354af7f343 (patch)
tree83e3376286d1a808d3f73276750b558776c272ac /include/linux/moduleparam.h
parentcd29296fdfca919590e4004a7e4905544f4c4a32 (diff)
parent07e0887302450a62f51dba72df6afb5fabb23d1c (diff)
downloadcachepc-linux-1c29d9899081d090cbe2aab128e527354af7f343.tar.gz
cachepc-linux-1c29d9899081d090cbe2aab128e527354af7f343.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/moduleparam.h')
-rw-r--r--include/linux/moduleparam.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
index 47879fc7f75e..6388eb9734a5 100644
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@ -22,7 +22,7 @@
#define __MODULE_INFO(tag, name, info) \
static const char __UNIQUE_ID(name)[] \
- __used __attribute__((section(".modinfo"), unused, aligned(1))) \
+ __used __section(".modinfo") __attribute__((unused, aligned(1))) \
= __MODULE_INFO_PREFIX __stringify(tag) "=" info
#define __MODULE_PARM_TYPE(name, _type) \
@@ -289,7 +289,7 @@ struct kparam_array
static const char __param_str_##name[] = prefix #name; \
static struct kernel_param __moduleparam_const __param_##name \
__used \
- __attribute__ ((unused,__section__ ("__param"),aligned(sizeof(void *)))) \
+ __section("__param") __attribute__ ((unused, aligned(sizeof(void *)))) \
= { __param_str_##name, THIS_MODULE, ops, \
VERIFY_OCTAL_PERMISSIONS(perm), level, flags, { arg } }