diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-08 01:42:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-08 01:42:05 -0700 |
| commit | 8b65bb57d87a66cd156f856f28f2bd72d7b2395e (patch) | |
| tree | 476525df2e81648751ff8f3595a4c10ea88aea05 /arch/sparc/lib/NGmemcpy.S | |
| parent | 542380a208c5eda9c27f9db099daa9d544626960 (diff) | |
| parent | 86e1066fe2af51dce4351c2357223e0d902dfc7a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Several fixes here, mostly having to due with either build errors or
memory corruptions depending upon whether you have THP enabled or not"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: remove unused wp_works_ok macro
sparc32: Export vac_cache_size to fix build error
sparc64: Fix memory corruption when THP is enabled
sparc64: Fix kernel panic due to erroneous #ifdef surrounding pmd_write()
arch/sparc: Avoid DCTI Couples
sparc64: kern_addr_valid regression
sparc64: Add support for 2G hugepages
sparc64: Fix size check in huge_pte_alloc
Diffstat (limited to 'arch/sparc/lib/NGmemcpy.S')
| -rw-r--r-- | arch/sparc/lib/NGmemcpy.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/lib/NGmemcpy.S b/arch/sparc/lib/NGmemcpy.S index d88c4ed50a00..cd654a719b27 100644 --- a/arch/sparc/lib/NGmemcpy.S +++ b/arch/sparc/lib/NGmemcpy.S @@ -394,6 +394,7 @@ FUNC_NAME: /* %i0=dst, %i1=src, %i2=len */ brz,pt %i2, 85f sub %o0, %i1, %i3 ba,a,pt %XCC, 90f + nop .align 64 70: /* 16 < len <= 64 */ |