diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 15:50:05 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2024-07-15 15:50:05 -0700 |
| commit | 3daee2e4b3568f0ed88b0598df96547fcf21cb9b (patch) | |
| tree | 19f47d0d4d3ff05266a25364959f0012a1825131 /include/linux/moduleloader.h | |
| parent | f3efefb6fdcce604413135bd8d4c5568e53a1f13 (diff) | |
| parent | 0c3836482481200ead7b416ca80c68a29cfdaabd (diff) | |
Merge tag 'v6.10' into next
Sync up with mainline to bring in device_for_each_child_node_scoped()
and other newer APIs.
Diffstat (limited to 'include/linux/moduleloader.h')
| -rw-r--r-- | include/linux/moduleloader.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 89b1e0ed9811..e395461d59e5 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -25,13 +25,6 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, /* Additional bytes needed by arch in front of individual sections */ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section); -/* Allocator used for allocating struct module, core sections and init - sections. Returns NULL on failure. */ -void *module_alloc(unsigned long size); - -/* Free memory returned from module_alloc. */ -void module_memfree(void *module_region); - /* Determines if the section name is an init section (that is only used during * module loading). */ @@ -129,12 +122,4 @@ void module_arch_cleanup(struct module *mod); /* Any cleanup before freeing mod->module_init */ void module_arch_freeing_init(struct module *mod); -#if (defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)) && \ - !defined(CONFIG_KASAN_VMALLOC) -#include <linux/kasan.h> -#define MODULE_ALIGN (PAGE_SIZE << KASAN_SHADOW_SCALE_SHIFT) -#else -#define MODULE_ALIGN PAGE_SIZE -#endif - #endif |