Skip to content

Commit 21a6ab2

Browse files
committed
Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull module updates from Jessica Yu: - Retire EXPORT_UNUSED_SYMBOL() and EXPORT_SYMBOL_GPL_FUTURE(). These export types were introduced between 2006 - 2008. All the of the unused symbols have been long removed and gpl future symbols were converted to gpl quite a long time ago, and I don't believe these export types have been used ever since. So, I think it should be safe to retire those export types now (Christoph Hellwig) - Refactor and clean up some aged code cruft in the module loader (Christoph Hellwig) - Build {,module_}kallsyms_on_each_symbol only when livepatching is enabled, as it is the only caller (Christoph Hellwig) - Unexport find_module() and module_mutex and fix the last module callers to not rely on these anymore. Make module_mutex internal to the module loader (Christoph Hellwig) - Harden ELF checks on module load and validate ELF structures before checking the module signature (Frank van der Linden) - Fix undefined symbol warning for clang (Fangrui Song) - Fix smatch warning (Dan Carpenter) * tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux: module: potential uninitialized return in module_kallsyms_on_each_symbol() module: remove EXPORT_UNUSED_SYMBOL* module: remove EXPORT_SYMBOL_GPL_FUTURE module: move struct symsearch to module.c module: pass struct find_symbol_args to find_symbol module: merge each_symbol_section into find_symbol module: remove each_symbol_in_section module: mark module_mutex static kallsyms: only build {,module_}kallsyms_on_each_symbol when required kallsyms: refactor {,module_}kallsyms_on_each_symbol module: use RCU to synchronize find_module module: unexport find_module and module_mutex drm: remove drm_fb_helper_modinit powerpc/powernv: remove get_cxl_module module: harden ELF info handling module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols
2 parents 7426869 + 1e80d9c commit 21a6ab2

35 files changed

Lines changed: 287 additions & 516 deletions

arch/arm/configs/bcm2835_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
176176
CONFIG_DYNAMIC_DEBUG=y
177177
CONFIG_DEBUG_INFO=y
178178
# CONFIG_ENABLE_MUST_CHECK is not set
179-
CONFIG_UNUSED_SYMBOLS=y
180179
CONFIG_DEBUG_MEMORY_INIT=y
181180
CONFIG_LOCKUP_DETECTOR=y
182181
CONFIG_SCHED_TRACER=y

arch/arm/configs/mxs_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ CONFIG_FONTS=y
164164
CONFIG_PRINTK_TIME=y
165165
CONFIG_DEBUG_INFO=y
166166
CONFIG_FRAME_WARN=2048
167-
CONFIG_UNUSED_SYMBOLS=y
168167
CONFIG_MAGIC_SYSRQ=y
169168
CONFIG_DEBUG_KERNEL=y
170169
CONFIG_SOFTLOCKUP_DETECTOR=y

arch/mips/configs/nlm_xlp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,6 @@ CONFIG_PRINTK_TIME=y
549549
CONFIG_DEBUG_INFO=y
550550
# CONFIG_ENABLE_MUST_CHECK is not set
551551
CONFIG_FRAME_WARN=1024
552-
CONFIG_UNUSED_SYMBOLS=y
553552
CONFIG_DEBUG_MEMORY_INIT=y
554553
CONFIG_DETECT_HUNG_TASK=y
555554
CONFIG_SCHEDSTATS=y

arch/mips/configs/nlm_xlr_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ CONFIG_CRC7=m
500500
CONFIG_PRINTK_TIME=y
501501
CONFIG_DEBUG_INFO=y
502502
# CONFIG_ENABLE_MUST_CHECK is not set
503-
CONFIG_UNUSED_SYMBOLS=y
504503
CONFIG_DEBUG_MEMORY_INIT=y
505504
CONFIG_DETECT_HUNG_TASK=y
506505
CONFIG_SCHEDSTATS=y

arch/parisc/configs/generic-32bit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ CONFIG_PCI_LBA=y
2222
CONFIG_MODULES=y
2323
CONFIG_MODULE_UNLOAD=y
2424
CONFIG_MODULE_FORCE_UNLOAD=y
25-
CONFIG_UNUSED_SYMBOLS=y
2625
# CONFIG_BLK_DEV_BSG is not set
2726
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
2827
CONFIG_BINFMT_MISC=m

arch/parisc/configs/generic-64bit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ CONFIG_MODULE_FORCE_LOAD=y
3131
CONFIG_MODULE_UNLOAD=y
3232
CONFIG_MODULE_FORCE_UNLOAD=y
3333
CONFIG_MODVERSIONS=y
34-
CONFIG_UNUSED_SYMBOLS=y
3534
CONFIG_BLK_DEV_INTEGRITY=y
3635
CONFIG_BINFMT_MISC=m
3736
# CONFIG_COMPACTION is not set

arch/powerpc/configs/ppc6xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1071,7 +1071,6 @@ CONFIG_NLS_ISO8859_15=m
10711071
CONFIG_NLS_KOI8_R=m
10721072
CONFIG_NLS_KOI8_U=m
10731073
CONFIG_DEBUG_INFO=y
1074-
CONFIG_UNUSED_SYMBOLS=y
10751074
CONFIG_HEADERS_INSTALL=y
10761075
CONFIG_MAGIC_SYSRQ=y
10771076
CONFIG_DEBUG_KERNEL=y

arch/powerpc/platforms/powernv/pci-cxl.c

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -150,25 +150,3 @@ int pnv_cxl_ioda_msi_setup(struct pci_dev *dev, unsigned int hwirq,
150150
return 0;
151151
}
152152
EXPORT_SYMBOL(pnv_cxl_ioda_msi_setup);
153-
154-
#if IS_MODULE(CONFIG_CXL)
155-
static inline int get_cxl_module(void)
156-
{
157-
struct module *cxl_module;
158-
159-
mutex_lock(&module_mutex);
160-
161-
cxl_module = find_module("cxl");
162-
if (cxl_module)
163-
__module_get(cxl_module);
164-
165-
mutex_unlock(&module_mutex);
166-
167-
if (!cxl_module)
168-
return -ENODEV;
169-
170-
return 0;
171-
}
172-
#else
173-
static inline int get_cxl_module(void) { return 0; }
174-
#endif

arch/s390/configs/debug_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
7171
CONFIG_MODVERSIONS=y
7272
CONFIG_MODULE_SRCVERSION_ALL=y
7373
CONFIG_MODULE_SIG_SHA256=y
74-
CONFIG_UNUSED_SYMBOLS=y
7574
CONFIG_BLK_DEV_INTEGRITY=y
7675
CONFIG_BLK_DEV_THROTTLING=y
7776
CONFIG_BLK_WBT=y

arch/s390/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
6666
CONFIG_MODVERSIONS=y
6767
CONFIG_MODULE_SRCVERSION_ALL=y
6868
CONFIG_MODULE_SIG_SHA256=y
69-
CONFIG_UNUSED_SYMBOLS=y
7069
CONFIG_BLK_DEV_THROTTLING=y
7170
CONFIG_BLK_WBT=y
7271
CONFIG_BLK_CGROUP_IOLATENCY=y

0 commit comments

Comments
 (0)