From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 24 Apr 2017 08:09:50 +0000 (+0800)
Subject: Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=899f35fabeea0d51fbfa146aaeaa9fc8f3b00292;p=linux.git

Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"

This reverts commit 42ae2922a68ac8d68927ccb052b486f34e5fba71.  It
causes a regression with older versions of gcc.  The consensus is
that this should instead be fixed in clang.

Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c
index 6b520e3f3ab1c..aefda9868627b 100644
--- a/arch/arm64/crypto/sha1-ce-glue.c
+++ b/arch/arm64/crypto/sha1-ce-glue.c
@@ -18,7 +18,7 @@
 #include <linux/module.h>
 
 #define ASM_EXPORT(sym, val) \
-	asm(".globl " #sym "; .set " #sym ", %c0" :: "i"(val));
+	asm(".globl " #sym "; .set " #sym ", %0" :: "I"(val));
 
 MODULE_DESCRIPTION("SHA1 secure hash using ARMv8 Crypto Extensions");
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");
diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c
index e3abe11de48c5..7cd587564a417 100644
--- a/arch/arm64/crypto/sha2-ce-glue.c
+++ b/arch/arm64/crypto/sha2-ce-glue.c
@@ -18,7 +18,7 @@
 #include <linux/module.h>
 
 #define ASM_EXPORT(sym, val) \
-	asm(".globl " #sym "; .set " #sym ", %c0" :: "i"(val));
+	asm(".globl " #sym "; .set " #sym ", %0" :: "I"(val));
 
 MODULE_DESCRIPTION("SHA-224/SHA-256 secure hash using ARMv8 Crypto Extensions");
 MODULE_AUTHOR("Ard Biesheuvel <ard.biesheuvel@linaro.org>");