diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-12 07:34:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-12 07:34:24 +0300 |
commit | 3b06b1a7448ee4e8e51dae3938774735404e51fb (patch) | |
tree | 5da6c7442bbdc0e3a63034fd752e3950b4349b0b /arch/sparc/lib/csum_copy.S | |
parent | 130568d5eac5537cbd64cfb12103550af90edb79 (diff) | |
parent | dbd2667a4fb9ce4f547982b07cd69dda127c47ea (diff) | |
download | linux-3b06b1a7448ee4e8e51dae3938774735404e51fb.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
- Fix symbol version generation for assembler on sparc, from
Nagarathnam Muthusamy.
- Fix compound page handling in gup_huge_pmd(), from Nitin Gupta.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Fix gup_huge_pmd
Adding the type of exported symbols
sed regex in Makefile.build requires line break between exported symbols
Adding asm-prototypes.h for genksyms to generate crc
Diffstat (limited to 'arch/sparc/lib/csum_copy.S')
-rw-r--r-- | arch/sparc/lib/csum_copy.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/lib/csum_copy.S b/arch/sparc/lib/csum_copy.S index 0ecbafc30fd0..b1051e77c49a 100644 --- a/arch/sparc/lib/csum_copy.S +++ b/arch/sparc/lib/csum_copy.S @@ -65,6 +65,7 @@ add %o5, %o4, %o4 .globl FUNC_NAME + .type FUNC_NAME,#function EXPORT_SYMBOL(FUNC_NAME) FUNC_NAME: /* %o0=src, %o1=dst, %o2=len, %o3=sum */ LOAD(prefetch, %o0 + 0x000, #n_reads) |