shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix mismerge

Browse Source 
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
This commit is contained in:
secuflag
2020-04-17 19:28:26 +02:00
committed by Chris
parent ffddea5b7b
commit 9799466c25
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/crypto/sha1-ce-glue.c
View File

@@ -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)
{

5
arch/arm64/crypto/sha2-ce-glue.c
View File

@@ -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,