Skip to content

Commit

Permalink
Merge tag 'csky-for-linus-5.14-rc1' of git://github.com/c-sky/csky-linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Jul 4, 2021
2 parents 0c66a95 + 90dc8c0 commit 0d4d4c6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
3 changes: 0 additions & 3 deletions arch/csky/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions arch/csky/mm/syscache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0d4d4c6

Please sign in to comment.