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

Merge tag 'parisc-for-7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fix from Helge Deller:
 "Fix for the cacheflush() syscall which had D/I caches mixed up"

* tag 'parisc-for-7.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Flush correct cache in cacheflush() syscall
parents 9b707712 2c98a8fb

arch/parisc/kernel/cache.c

+2 −2
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, bytes, 
#else

			"1: cmpb,<<,n	%0,%2,1b\n"

#endif

			"   fic,m	%3(%4,%0)\n"

			"   fdc,m	%3(%4,%0)\n"

			"2: sync\n"

			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b, "%1")

			: "+r" (start), "+r" (error)
@@ -968,7 +968,7 @@ SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, bytes, 
#else

			"1: cmpb,<<,n	%0,%2,1b\n"

#endif

			"   fdc,m	%3(%4,%0)\n"

			"   fic,m	%3(%4,%0)\n"

			"2: sync\n"

			ASM_EXCEPTIONTABLE_ENTRY_EFAULT(1b, 2b, "%1")

			: "+r" (start), "+r" (error)