Module Name: src Committed By: riastradh Date: Sun Dec 19 09:52:17 UTC 2021
Modified Files: src/sys/external/bsd/drm2/include/linux: module.h moduleparam.h Log Message: move MODULE_PARM_DESC to moduleparam.h Author: Maya Rashish <m...@netbsd.org> To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/include/linux/module.h cvs rdiff -u -r1.9 -r1.10 \ src/sys/external/bsd/drm2/include/linux/moduleparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/include/linux/module.h diff -u src/sys/external/bsd/drm2/include/linux/module.h:1.10 src/sys/external/bsd/drm2/include/linux/module.h:1.11 --- src/sys/external/bsd/drm2/include/linux/module.h:1.10 Sun Dec 19 01:41:45 2021 +++ src/sys/external/bsd/drm2/include/linux/module.h Sun Dec 19 09:52:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: module.h,v 1.10 2021/12/19 01:41:45 riastradh Exp $ */ +/* $NetBSD: module.h,v 1.11 2021/12/19 09:52:17 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -49,17 +49,6 @@ #define MODULE_DEVICE_TABLE(DESCRIPTION, IDLIST) #define MODULE_FIRMWARE(FIRMWARE) #define MODULE_LICENSE(LICENSE) -struct linux_module_param_desc { - const char *name; - const char *description; -}; -#define MODULE_PARM_DESC(PARAMETER, DESCRIPTION) \ -static __attribute__((__used__)) \ -const struct linux_module_param_desc PARAMETER ## _desc = { \ - .name = # PARAMETER, \ - .description = DESCRIPTION, \ -}; \ -__link_set_add_rodata(linux_module_param_desc, PARAMETER ## _desc) #define THIS_MODULE 0 #define KBUILD_MODNAME __file__ Index: src/sys/external/bsd/drm2/include/linux/moduleparam.h diff -u src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.9 src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.10 --- src/sys/external/bsd/drm2/include/linux/moduleparam.h:1.9 Sun Dec 19 01:43:12 2021 +++ src/sys/external/bsd/drm2/include/linux/moduleparam.h Sun Dec 19 09:52:17 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: moduleparam.h,v 1.9 2021/12/19 01:43:12 riastradh Exp $ */ +/* $NetBSD: moduleparam.h,v 1.10 2021/12/19 09:52:17 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -67,4 +67,17 @@ __link_set_add_data(linux_module_param_i #define module_param_unsafe module_param #define module_param_named_unsafe module_param_named +struct linux_module_param_desc { + const char *name; + const char *description; +}; +#define MODULE_PARM_DESC(PARAMETER, DESCRIPTION) \ +static __attribute__((__used__)) \ +const struct linux_module_param_desc PARAMETER ## _desc = { \ + .name = # PARAMETER, \ + .description = DESCRIPTION, \ +}; \ +__link_set_add_rodata(linux_module_param_desc, PARAMETER ## _desc) + + #endif /* _LINUX_MODULEPARAM_H_ */