diff options
| author | Augusto Caringi <acaringi@redhat.com> | 2020-06-29 15:02:20 -0300 |
|---|---|---|
| committer | Augusto Caringi <acaringi@redhat.com> | 2020-06-29 15:02:20 -0300 |
| commit | 9b53592daf7ec9906beefa9e36772dafcf446132 (patch) | |
| tree | ad225c0978d9a8ab32e649eb21b43492525b3c4e /0001-modules-add-rhelversion-MODULE_INFO-tag.patch | |
| parent | a6d5bdfa755afd46b7cb294d2a32a4f53e79aef3 (diff) | |
| download | kernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.gz kernel-9b53592daf7ec9906beefa9e36772dafcf446132.tar.xz kernel-9b53592daf7ec9906beefa9e36772dafcf446132.zip | |
kernel-5.8.0-0.rc3.1
* Mon Jun 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.1]
- v5.8-rc3 rebase
- s390x-zfcpdump: Handle missing Module.symvers file (Don Zickus)
- Updated changelog for the release based on 8be3a53e18e0 (Fedora Kernel Team)
Resolves: rhbz#
Signed-off-by: Augusto Caringi <acaringi@redhat.com>
Diffstat (limited to '0001-modules-add-rhelversion-MODULE_INFO-tag.patch')
| -rw-r--r-- | 0001-modules-add-rhelversion-MODULE_INFO-tag.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch index 055fdcb0e..70a486e4e 100644 --- a/0001-modules-add-rhelversion-MODULE_INFO-tag.patch +++ b/0001-modules-add-rhelversion-MODULE_INFO-tag.patch @@ -91,20 +91,20 @@ index 2e6670860d27..8c35a5db7d7e 100644 const char *srcversion; + const char *rhelversion; struct kobject *holders_dir; - + /* Exported symbols */ diff --git a/kernel/module.c b/kernel/module.c -index e8a198588f26..98b34eb6d14f 100644 +index 0c6573b98c36..4898faa4e8e1 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = { \ - + MODINFO_ATTR(version); MODINFO_ATTR(srcversion); +MODINFO_ATTR(rhelversion); - + static char last_unloaded_module[MODULE_NAME_LEN+1]; - + @@ -1266,6 +1267,7 @@ static struct module_attribute *modinfo_attrs[] = { &module_uevent, &modinfo_version, @@ -122,13 +122,13 @@ index 6aea65c65745..ed3c4d8a1c7f 100644 #include "modpost.h" #include "../../include/linux/license.h" +#include "../../include/generated/uapi/linux/version.h" - + /* Are we using CONFIG_MODVERSIONS? */ static int modversions = 0; @@ -2384,6 +2385,12 @@ static void write_buf(struct buffer *b, const char *fname) } } - + +static void add_rhelversion(struct buffer *b, struct module *mod) +{ + buf_printf(b, "MODULE_INFO(rhelversion, \"%d.%d\");\n", RHEL_MAJOR, @@ -143,9 +143,9 @@ index 6aea65c65745..ed3c4d8a1c7f 100644 add_moddevtable(&buf, mod); add_srcversion(&buf, mod); + add_rhelversion(&buf, mod); - + sprintf(fname, "%s.mod.c", mod->name); write_if_changed(&buf, fname); -- -2.26.2 +2.25.4 |