diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-04 18:34:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-04 18:34:13 -0700 |
| commit | 048c9acca90ca7da42b92745445fe008a48add88 (patch) | |
| tree | e2e551a565a7dcdca0fc398aa659231745e5a901 /arch/x86/crypto/crc32-pclmul_asm.S | |
| parent | 07df841877195765d958df146f614fc7bdedd5e3 (diff) | |
| parent | ad348cc5349be4ef4abe08819afbb63386585413 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Merge sparc bug fixes that didn't make it into v3.9 into
sparc-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/crypto/crc32-pclmul_asm.S')
| -rw-r--r-- | arch/x86/crypto/crc32-pclmul_asm.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/crypto/crc32-pclmul_asm.S b/arch/x86/crypto/crc32-pclmul_asm.S index c8335014a04..94c27df8a54 100644 --- a/arch/x86/crypto/crc32-pclmul_asm.S +++ b/arch/x86/crypto/crc32-pclmul_asm.S @@ -101,9 +101,8 @@ * uint crc32_pclmul_le_16(unsigned char const *buffer, * size_t len, uint crc32) */ -.globl crc32_pclmul_le_16 -.align 4, 0x90 -crc32_pclmul_le_16:/* buffer and buffer size are 16 bytes aligned */ + +ENTRY(crc32_pclmul_le_16) /* buffer and buffer size are 16 bytes aligned */ movdqa (BUF), %xmm1 movdqa 0x10(BUF), %xmm2 movdqa 0x20(BUF), %xmm3 @@ -244,3 +243,4 @@ fold_64: pextrd $0x01, %xmm1, %eax ret +ENDPROC(crc32_pclmul_le_16) |