From d2c17bd326c237c4f9128213f1b3f245a842449f Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sat, 19 Jan 2013 13:39:21 +0200
Subject: [PATCH] --- yaml --- r: 357735 b: refs/heads/master c:
 698a5abbb0c15ac273bf02f55a1385725714353a h: refs/heads/master i:   357733:
 9e02f6c8890327c5b1b8104a546410e9d471174b   357731:
 a410280b610f86fde29d22437e93623181ba22a1   357727:
 7545dc7c74a99755ade9f2983a773df84cd1c88a v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea4b97360cdd..e4caa74e4884 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1985fecf019dae1db78c90ef9af435e1462e7766
+refs/heads/master: 698a5abbb0c15ac273bf02f55a1385725714353a
diff --git a/trunk/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/trunk/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
index 93c6d39237ac..cf1a7ec4cc3a 100644
--- a/trunk/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
+++ b/trunk/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