Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4f2aa80 authored by John Stultz's avatar John Stultz
Browse files

arch/arm64/crypto/sha1-ce-glue.c fix 4.9.129 merge issue 



Similar to the earlier sha2-ce-glue.c build issue, it seems the
same lines got included twice.

Reported-by: default avatarChienwei Chang <chienwei.chang@mediatek.com>
Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Greg Kroah-Hartman <gregkh@google.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 51d13fca

arch/arm64/crypto/sha1-ce-glue.c

+0 −3
Original line number Diff line number Diff line
@@ -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)

{