Commit 0d4d4c6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0c66a95c 90dc8c0e

arch/csky/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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

arch/csky/mm/syscache.c

+7 −5
Original line number Diff line number Diff line
@@ -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;