diff options
| author | Linus Torvalds | 2021-07-04 12:07:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2021-07-04 12:07:54 -0700 |
| commit | 0d4d4c6ff6debde4c44a418c59b304d4b514541c (patch) | |
| tree | c20967f6c9e18ac73460e95dd5fbd578da6bc684 | |
| parent | 0c66a95c7e014abc3489e69dd3972d9225027d49 (diff) | |
| parent | 90dc8c0e664efcb14e2f133309d84bfdcb0b3d24 (diff) | |
Merge tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren:
"A small cleanup and a fixup"
* tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux:
csky: Kconfig: Remove unused selects
csky: syscache: Fixup duplicate cache flush
| -rw-r--r-- | arch/csky/Kconfig | 3 | ||||
| -rw-r--r-- | arch/csky/mm/syscache.c | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 8de5b987edb9..2716f6395ba7 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -76,8 +76,6 @@ config CSKY select PERF_USE_VMALLOC if CPU_CK610 select RTC_LIB select TIMER_OF - select USB_ARCH_HAS_EHCI - select USB_ARCH_HAS_OHCI select GENERIC_PCI_IOMAP select HAVE_PCI select PCI_DOMAINS_GENERIC if PCI @@ -245,7 +243,6 @@ endchoice menuconfig HAVE_TCM bool "Tightly-Coupled/Sram Memory" - select GENERIC_ALLOCATOR help The implementation are not only used by TCM (Tightly-Coupled Meory) but also used by sram on SOC bus. It follow existed linux tcm diff --git a/arch/csky/mm/syscache.c b/arch/csky/mm/syscache.c index 4e51d63850c4..cd847ad62c7e 100644 --- a/arch/csky/mm/syscache.c +++ b/arch/csky/mm/syscache.c @@ -12,15 +12,17 @@ SYSCALL_DEFINE3(cacheflush, int, cache) { switch (cache) { - case ICACHE: case BCACHE: - flush_icache_mm_range(current->mm, - (unsigned long)addr, - (unsigned long)addr + bytes); - fallthrough; case DCACHE: dcache_wb_range((unsigned long)addr, (unsigned long)addr + bytes); + if (cache != BCACHE) + break; + fallthrough; + case ICACHE: + flush_icache_mm_range(current->mm, + (unsigned long)addr, + (unsigned long)addr + bytes); break; default: return -EINVAL; |