Merge branch 'lpc32xx/defconfig' of git://git.antcom.de/linux-2.6 into next/soc

[~andy/linux] / arch / x86 / crypto / crc32c-pcl-intel-asm_64.S

diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
index 93c6d39237ac3753c1f1e7600351192715829a90..cf1a7ec4cc3ae782fe0d1efa03a3db4649e60c2a 100644 (file)
--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
@@ -42,6 +42,8 @@
  * SOFTWARE.
  */
 
+#include <linux/linkage.h>
+
 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
 
 .macro LABEL prefix n
@@ -68,8 +70,7 @@
 
 # unsigned int crc_pcl(u8 *buffer, int len, unsigned int crc_init);
 
-.global crc_pcl
-crc_pcl:
+ENTRY(crc_pcl)
 #define    bufp                %rdi
 #define    bufp_dw     %edi
 #define    bufp_w      %di
@@ -323,6 +324,9 @@ JMPTBL_ENTRY %i
 .noaltmacro
        i=i+1
 .endr
+
+ENDPROC(crc_pcl)
+
        ################################################################
        ## PCLMULQDQ tables
        ## Table is 128 entries x 2 quad words each