renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
Code

arch/csky patches for 5.14-rc1

Browse Source 
Two small cleanup & fixup.
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCgAwFiEE2KAv+isbWR/viAKHAXH1GYaIxXsFAmDhgrsSHGd1b3JlbkBr
 ZXJuZWwub3JnAAoJEAFx9RmGiMV7AfcP/22iiQMXB4ktH2GrVXlKPvjObhn0q8aS
 9+LKjdn49W8+5O6ZNvHi7GMHtrexoCR1Zv8hWL0NRBh/zh7J7+azLELSSXs8/LAj
 XPH8OXJ/RN1Xf//+O4tDxpyHQhKvAHoJLdhRB2CaI6WzZh1pV7rS5iYZ+/mXIQIQ
 Bn8xSEMC25JZfan7tTE+caxnDOW+KwbPhzeCjPwDJJR7Ow9D+4+dCcWUm1zm3Ooq
 elaXhFx8TPZjRnpw1jxCLxJXy1Q+o2eGuHjKmV7+SIfH2J3V3bBjIZGwVSxvIYAf
 OliUCmVD/XermM1E+hCiPNXjVxV5GqTqmZr0BKJvkutkiAaRAYnYxJxx7mR4kxN/
 eJwRIHT4BaiCw64SiUAr8mJMsWHaDp8HBhjbTeU9w0m85afMdtIVnQCgpNJKGaGm
 Fi1A6hnA2A/HYAKPNJRYeqbCR2r3fHS1hvY9V4vMsC31u64+k6jmph0qFxgljLjk
 IIP4CSdgiQ/2vWNR6qWVx0hnKE+lj6hh7D1hA8CjS3+Ym2/TMi6fEqlCEZhZB97a
 wB1TJGWIOQl8UwNeEeAe6dZz7qsUUqN9lIzAwZjY0pgk0Vw5IMv8BRS6o9NiFz3u
 MY8GPz2q6Sl/eP+KhuWT7brUJtzW+Jm7t1F0IJbP4+G8jVRTs7+js9IQhlkp0tvH
 y0+/Zidsf/uq
 =lAc+
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-07-04 12:07:54 -07:00
commit 0d4d4c6ff6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/csky/Kconfig
View File

@ -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

12
arch/csky/mm/syscache.c
View File

@ -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;