diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 07:34:53 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 07:34:53 +0200 |
commit | 38a4671cad3f0d277cf48445b49e42a475ebfb6a (patch) | |
tree | 7348f3dd5f4e1bec39758dcff748a9dcbbf3430c /arch/x86/crypto/crc32-pclmul_asm.S | |
parent | pcmcia/trivial: at91_cf: fix checkpatch error (diff) | |
parent | Linux 3.10-rc5 (diff) | |
download | linux-38a4671cad3f0d277cf48445b49e42a475ebfb6a.tar.xz linux-38a4671cad3f0d277cf48445b49e42a475ebfb6a.zip |
Merge 3.10-rc5 into char-misc-next
Diffstat (limited to 'arch/x86/crypto/crc32-pclmul_asm.S')
-rw-r--r-- | arch/x86/crypto/crc32-pclmul_asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/crc32-pclmul_asm.S b/arch/x86/crypto/crc32-pclmul_asm.S index 94c27df8a549..f247304299a2 100644 --- a/arch/x86/crypto/crc32-pclmul_asm.S +++ b/arch/x86/crypto/crc32-pclmul_asm.S @@ -240,7 +240,7 @@ fold_64: pand %xmm3, %xmm1 PCLMULQDQ 0x00, CONSTANT, %xmm1 pxor %xmm2, %xmm1 - pextrd $0x01, %xmm1, %eax + PEXTRD 0x01, %xmm1, %eax ret ENDPROC(crc32_pclmul_le_16) |