From 9799466c2501cbf90f51875e08c708a78e2ed2ef Mon Sep 17 00:00:00 2001 From: secuflag Date: Fri, 17 Apr 2020 19:28:26 +0200 Subject: [PATCH] Fix mismerge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit arch/arm64/crypto/sha1-ce-glue.c:43:11: error: redefinition of ‘sha1_ce_offsetof_count’ 43 | const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count); | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha1-ce-glue.c:40:11: note: previous definition of ‘sha1_ce_offsetof_count’ was here 40 | const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count); | ^~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha1-ce-glue.c:44:11: error: redefinition of ‘sha1_ce_offsetof_finalize’ 44 | const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize); | ^~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha1-ce-glue.c:41:11: note: previous definition of ‘sha1_ce_offsetof_finalize’ was here 41 | const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize); | ^~~~~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.build:334: recipe for target 'arch/arm64/crypto/sha1-ce-glue.o' failed arch/arm64/crypto/sha2-ce-glue.c:45:11: error: redefinition of ‘sha256_ce_offsetof_count’ 45 | const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state, | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha2-ce-glue.c:40:11: note: previous definition of ‘sha256_ce_offsetof_count’ was here 40 | const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state, | ^~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha2-ce-glue.c:47:11: error: redefinition of ‘sha256_ce_offsetof_finalize’ 47 | const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ arch/arm64/crypto/sha2-ce-glue.c:42:11: note: previous definition of ‘sha256_ce_offsetof_finalize’ was here 42 | const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.build:334: recipe for target 'arch/arm64/crypto/sha2-ce-glue.o' failed --- arch/arm64/crypto/sha1-ce-glue.c | 3 --- arch/arm64/crypto/sha2-ce-glue.c | 5 ----- 2 files changed, 8 deletions(-) diff --git a/arch/arm64/crypto/sha1-ce-glue.c b/arch/arm64/crypto/sha1-ce-glue.c index 1a1bf78854f7..f08ecf431dcf 100644 --- a/arch/arm64/crypto/sha1-ce-glue.c +++ b/arch/arm64/crypto/sha1-ce-glue.c @@ -40,9 +40,6 @@ static inline void __cfi_sha1_ce_transform(struct sha1_state *sst, const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count); const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize); -const u32 sha1_ce_offsetof_count = offsetof(struct sha1_ce_state, sst.count); -const u32 sha1_ce_offsetof_finalize = offsetof(struct sha1_ce_state, finalize); - static int sha1_ce_update(struct shash_desc *desc, const u8 *data, unsigned int len) { diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c index c9539c1641e2..c2432210f5e2 100644 --- a/arch/arm64/crypto/sha2-ce-glue.c +++ b/arch/arm64/crypto/sha2-ce-glue.c @@ -37,11 +37,6 @@ static inline void __cfi_sha2_ce_transform(struct sha256_state *sst, #define sha2_ce_transform __cfi_sha2_ce_transform #endif -const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state, - sst.count); -const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state, - finalize); - const u32 sha256_ce_offsetof_count = offsetof(struct sha256_ce_state, sst.count); const u32 sha256_ce_offsetof_finalize = offsetof(struct sha256_ce_state,