path: root/arch/sparc/lib/NG2memcpy.S
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-23 15:41:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-23 15:41:52 -0700
commit1ee1ceafb572f1a925809168267a7962a4289de8 (patch)
tree101746dc9edf09d32ac9b24b91f2491bc06bf74b /arch/sparc/lib/NG2memcpy.S
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff)
parentsparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller: "A small bunch of bug fixes, in particular: 1) On older cpus we need a different chunk of virtual address space to map the huge page TSB. 2) Missing memory barrier in Niagara2 memcpy. 3) trinity showed some places where fault validation was unnecessarily loud on sparc64 4) Some sysfs printf's need a type adjustment, from Toralf Förster" * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c sparc64: Add membar to Niagara2 memcpy code. sparc64: Fix huge TSB mapping on pre-UltraSPARC-III cpus. sparc64: Don't bark so loudly about 32-bit tasks generating 64-bit fault addresses.
Diffstat (limited to 'arch/sparc/lib/NG2memcpy.S')
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/lib/NG2memcpy.S b/arch/sparc/lib/NG2memcpy.S
index 2c20ad63ddbf..30eee6e8a81b 100644
--- a/arch/sparc/lib/NG2memcpy.S
+++ b/arch/sparc/lib/NG2memcpy.S
@@ -236,6 +236,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
+ membar #Sync
alignaddr %o1, %g0, %g0
add %o1, (64 - 1), %o4