diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2025-02-14 10:32:04 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2025-02-14 10:32:04 +0100 |
| commit | 92d2da37fdef65f9aeeb54c991df0cec524934ad (patch) | |
| tree | 38d3036f7f89f88d34eceda9cb2344c207ec7b97 /include/linux/module.h | |
| parent | a64dcfb451e254085a7daee5fe51bf22959d52d3 (diff) | |
| parent | 675204778c69c2b3e0f6a4e2dbfeb4f3e89194ba (diff) | |
Merge branch 'x86/mm'
Depends on the simplifications from commit 1d7e707af446 ("Revert "x86/module: prepare module loading for ROX allocations of text"")
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 30e5b19bafa9..9937e71a3b5b 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -370,7 +370,6 @@ enum mod_mem_type { struct module_memory { void *base; - void *rw_copy; bool is_rox; unsigned int size; @@ -772,16 +771,6 @@ static inline bool is_livepatch_module(struct module *mod) void set_module_sig_enforced(void); -void *__module_writable_address(struct module *mod, void *loc); - -static inline void *module_writable_address(struct module *mod, void *loc) -{ - if (!IS_ENABLED(CONFIG_ARCH_HAS_EXECMEM_ROX) || !mod || - mod->state != MODULE_STATE_UNFORMED) - return loc; - return __module_writable_address(mod, loc); -} - #else /* !CONFIG_MODULES... */ static inline struct module *__module_address(unsigned long addr) @@ -889,11 +878,6 @@ static inline bool module_is_coming(struct module *mod) { return false; } - -static inline void *module_writable_address(struct module *mod, void *loc) -{ - return loc; -} #endif /* CONFIG_MODULES */ #ifdef CONFIG_SYSFS |