diff options
| author | Jisheng Zhang (syna) <Jisheng.Zhang@synaptics.com> | 2021-04-12 09:05:48 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-04-18 19:15:11 +0100 |
| commit | aefdd4383bb0057c1ec1e32e7de348ccd749eb20 (patch) | |
| tree | 148cc5b340f07e8778666211367daeece9a419ef /arch | |
| parent | 32e9a0d5ffaffe035f99188602d328665c43f38f (diff) | |
| download | linux-stable-aefdd4383bb0057c1ec1e32e7de348ccd749eb20.tar.gz linux-stable-aefdd4383bb0057c1ec1e32e7de348ccd749eb20.tar.bz2 linux-stable-aefdd4383bb0057c1ec1e32e7de348ccd749eb20.zip | |
ARM: 9072/1: mm: remove set_kernel_text_r[ow]()
After commit 5a735583b764 ("arm/ftrace: Use __patch_text()"), the last
and only user of these functions has gone, remove them.
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/set_memory.h | 8 | ||||
| -rw-r--r-- | arch/arm/mm/init.c | 21 |
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/include/asm/set_memory.h b/arch/arm/include/asm/set_memory.h index a1ceff4295d3..ec17fc0fda7a 100644 --- a/arch/arm/include/asm/set_memory.h +++ b/arch/arm/include/asm/set_memory.h @@ -18,12 +18,4 @@ static inline int set_memory_x(unsigned long addr, int numpages) { return 0; } static inline int set_memory_nx(unsigned long addr, int numpages) { return 0; } #endif -#ifdef CONFIG_STRICT_KERNEL_RWX -void set_kernel_text_rw(void); -void set_kernel_text_ro(void); -#else -static inline void set_kernel_text_rw(void) { } -static inline void set_kernel_text_ro(void) { } -#endif - #endif diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 828a2561b229..039c19597c7a 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -487,33 +487,12 @@ static int __mark_rodata_ro(void *unused) return 0; } -static int kernel_set_to_readonly __read_mostly; - void mark_rodata_ro(void) { - kernel_set_to_readonly = 1; stop_machine(__mark_rodata_ro, NULL, NULL); debug_checkwx(); } -void set_kernel_text_rw(void) -{ - if (!kernel_set_to_readonly) - return; - - set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), false, - current->active_mm); -} - -void set_kernel_text_ro(void) -{ - if (!kernel_set_to_readonly) - return; - - set_section_perms(ro_perms, ARRAY_SIZE(ro_perms), true, - current->active_mm); -} - #else static inline void fix_kernmem_perms(void) { } #endif /* CONFIG_STRICT_KERNEL_RWX */ |