From be17941e6eecaf425045b521c264283b1880d537 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sat, 19 Jan 2013 13:39:41 +0200
Subject: [PATCH] --- yaml --- r: 357739 b: refs/heads/master c:
 ac9d55dd42858b127bedb84f4e59789958263d37 h: refs/heads/master i:   357737:
 91883c4d0fdc4a5b49b505731b61a38d01bf3b1f   357735:
 d2c17bd326c237c4f9128213f1b3f245a842449f v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/crypto/sha1_ssse3_asm.S | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8e830d59ffbe..db79e03e288a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dcfd44dee3fd3a63e3e3d3f5cbfd2436d1f98a6
+refs/heads/master: ac9d55dd42858b127bedb84f4e59789958263d37
diff --git a/trunk/arch/x86/crypto/sha1_ssse3_asm.S b/trunk/arch/x86/crypto/sha1_ssse3_asm.S
index 49d6987a73d9..a4109506a5e8 100644
--- a/trunk/arch/x86/crypto/sha1_ssse3_asm.S
+++ b/trunk/arch/x86/crypto/sha1_ssse3_asm.S
@@ -28,6 +28,8 @@
  * (at your option) any later version.
  */
 
+#include <linux/linkage.h>
+
 #define CTX	%rdi	// arg1
 #define BUF	%rsi	// arg2
 #define CNT	%rdx	// arg3
@@ -69,10 +71,8 @@
  * param: function's name
  */
 .macro SHA1_VECTOR_ASM  name
-	.global	\name
-	.type	\name, @function
-	.align 32
-\name:
+	ENTRY(\name)
+
 	push	%rbx
 	push	%rbp
 	push	%r12
@@ -106,7 +106,7 @@
 	pop	%rbx
 	ret
 
-	.size	\name, .-\name
+	ENDPROC(\name)
 .endm
 
 /*