| Message ID | 20200515143646.3857579-30-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [01/29] arm: fix the flush_icache_range arguments in set_fiq_handler | expand |
+++ Christoph Hellwig [15/05/20 16:36 +0200]: >flush_icache_range generally operates on kernel addresses, but for some >reason m68k needed a set_fs override. Move that into the m68k code >insted of keeping it in the module loader. > >Signed-off-by: Christoph Hellwig <hch@lst.de> >Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org> >Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> >--- > arch/m68k/mm/cache.c | 4 ++++ > kernel/module.c | 8 -------- > 2 files changed, 4 insertions(+), 8 deletions(-) Thanks for cleaning this up. For module.c: Acked-by: Jessica Yu <jeyu@kernel.org>
diff --git a/arch/m68k/mm/cache.c b/arch/m68k/mm/cache.c index 7915be3a09712..5ecb3310e8745 100644 --- a/arch/m68k/mm/cache.c +++ b/arch/m68k/mm/cache.c @@ -107,7 +107,11 @@ void flush_icache_user_range(unsigned long address, unsigned long endaddr) void flush_icache_range(unsigned long address, unsigned long endaddr) { + mm_segment_t old_fs = get_fs(); + + set_fs(KERNEL_DS); flush_icache_user_range(address, endaddr); + set_fs(old_fs); } EXPORT_SYMBOL(flush_icache_range); diff --git a/kernel/module.c b/kernel/module.c index 646f1e2330d2b..b1673ed49594f 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3312,12 +3312,6 @@ static int check_module_license_and_versions(struct module *mod) static void flush_module_icache(const struct module *mod) { - mm_segment_t old_fs; - - /* flush the icache in correct context */ - old_fs = get_fs(); - set_fs(KERNEL_DS); - /* * Flush the instruction cache, since we've played with text. * Do it before processing of module parameters, so the module @@ -3329,8 +3323,6 @@ static void flush_module_icache(const struct module *mod) + mod->init_layout.size); flush_icache_range((unsigned long)mod->core_layout.base, (unsigned long)mod->core_layout.base + mod->core_layout.size); - - set_fs(old_fs); } int __weak module_frob_arch_sections(Elf_Ehdr *hdr,