diff options
author | Linus Torvalds | 2022-02-17 09:54:00 -0800 |
---|---|---|
committer | Linus Torvalds | 2022-02-17 09:54:00 -0800 |
commit | edbd6c628ef194ebef6e7b82ec9e396f57695d06 (patch) | |
tree | 5985d3beb6a88367300850a332607d866b7e5a09 | |
parent | 80d47f5de5e311cbc0d01ebb6ee684e8f4c196c6 (diff) | |
parent | a8e8f851e8299703a005cf23dfb9ec854a2611e5 (diff) |
Merge tag 'modules-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull module fix from Luis Chamberlain:
"Fixes module decompression when CONFIG_SYSFS=n
The only fix trickled down for v5.17-rc cycle so far is the fix for
module decompression when CONFIG_SYSFS=n. This was reported through
0-day"
* tag 'modules-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
module: fix building with sysfs disabled
-rw-r--r-- | kernel/module_decompress.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/module_decompress.c b/kernel/module_decompress.c index b01c69c2ff99..ffef98a20320 100644 --- a/kernel/module_decompress.c +++ b/kernel/module_decompress.c @@ -250,6 +250,7 @@ void module_decompress_cleanup(struct load_info *info) info->max_pages = info->used_pages = 0; } +#ifdef CONFIG_SYSFS static ssize_t compression_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -269,3 +270,4 @@ static int __init module_decompress_sysfs_init(void) return 0; } late_initcall(module_decompress_sysfs_init); +#endif |