| Message ID | 20210127023806.3753812-2-siyanteng@loongson.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e6a52b8f0f810781e031096442a532fdb179a3cc |
| Headers | show |
| Series | [v3,1/2] MIPS: loongson2ef: remove function __uncached_access() | expand |
On Wed, Jan 27, 2021 at 10:38:06AM +0800, Yanteng Si wrote: > MIPS can now use the default uncached_access like other archs. > > Signed-off-by: Yanteng Si <siyanteng@loongson.cn> > --- > arch/mips/mm/cache.c | 8 -------- > drivers/char/mem.c | 7 ------- > 2 files changed, 15 deletions(-) > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Wed, Jan 27, 2021 at 10:38:06AM +0800, Yanteng Si wrote: > MIPS can now use the default uncached_access like other archs. > > Signed-off-by: Yanteng Si <siyanteng@loongson.cn> > --- > arch/mips/mm/cache.c | 8 -------- > drivers/char/mem.c | 7 ------- > 2 files changed, 15 deletions(-) applied to mips-next. Thomas.
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c index 23b16bfd97b2..9cfd432d99f6 100644 --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c @@ -207,11 +207,3 @@ void cpu_cache_init(void) setup_protection_map(); } - -int __weak __uncached_access(struct file *file, unsigned long addr) -{ - if (file->f_flags & O_DSYNC) - return 1; - - return addr >= __pa(high_memory); -} diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 43c871dc7477..869b9f5e8e03 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -291,13 +291,6 @@ static int uncached_access(struct file *file, phys_addr_t addr) * attribute aliases. */ return !(efi_mem_attributes(addr) & EFI_MEMORY_WB); -#elif defined(CONFIG_MIPS) - { - extern int __uncached_access(struct file *file, - unsigned long addr); - - return __uncached_access(file, addr); - } #else /* * Accessing memory above the top the kernel knows about or through a
MIPS can now use the default uncached_access like other archs. Signed-off-by: Yanteng Si <siyanteng@loongson.cn> --- arch/mips/mm/cache.c | 8 -------- drivers/char/mem.c | 7 ------- 2 files changed, 15 deletions(-)